diff options
Diffstat (limited to 'includes/ObjectCache.php')
| -rw-r--r-- | includes/ObjectCache.php | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/includes/ObjectCache.php b/includes/ObjectCache.php index 6cfb2340..f83e0020 100644 --- a/includes/ObjectCache.php +++ b/includes/ObjectCache.php @@ -34,7 +34,7 @@ $wgCaches = array(); /** * Get a cache object. - * @param int $inputType cache type, one the the CACHE_* constants. + * @param $inputType Integer: cache type, one the the CACHE_* constants. */ function &wfGetCache( $inputType ) { global $wgCaches, $wgMemCachedServers, $wgMemCachedDebug, $wgMemCachedPersistent; @@ -52,13 +52,6 @@ function &wfGetCache( $inputType ) { if ( $type == CACHE_MEMCACHED ) { if ( !array_key_exists( CACHE_MEMCACHED, $wgCaches ) ) { - if ( !class_exists( 'MemcachedClientforWiki' ) ) { - class MemCachedClientforWiki extends memcached { - function _debugprint( $text ) { - wfDebug( "memcached: $text" ); - } - } - } $wgCaches[CACHE_MEMCACHED] = new MemCachedClientforWiki( array('persistant' => $wgMemCachedPersistent, 'compress_threshold' => 1500 ) ); $wgCaches[CACHE_MEMCACHED]->set_servers( $wgMemCachedServers ); @@ -73,8 +66,6 @@ function &wfGetCache( $inputType ) { $wgCaches[CACHE_ACCEL] = new APCBagOStuff; } elseif( function_exists( 'xcache_get' ) ) { $wgCaches[CACHE_ACCEL] = new XCacheBagOStuff(); - } elseif ( function_exists( 'mmcache_get' ) ) { - $wgCaches[CACHE_ACCEL] = new TurckBagOStuff; } else { $wgCaches[CACHE_ACCEL] = false; } @@ -91,7 +82,7 @@ function &wfGetCache( $inputType ) { if ( $type == CACHE_DB || ( $inputType == CACHE_ANYTHING && $cache === false ) ) { if ( !array_key_exists( CACHE_DB, $wgCaches ) ) { - $wgCaches[CACHE_DB] = new MediaWikiBagOStuff('objectcache'); + $wgCaches[CACHE_DB] = new SqlBagOStuff('objectcache'); } $cache =& $wgCaches[CACHE_DB]; } |