MediaWiki 1.17.0

[autoinstallsdev/mediawiki.git] / includes / ObjectCache.php

diff --git a/includes/ObjectCache.php b/includes/ObjectCache.php
index 6cfb2340f4f7c16f890cdd511f0a57627e6c4595..db22c0747cb061715bca4659c64ceab73770bfb5 100644 (file)
--- a/includes/ObjectCache.php
+++ b/includes/ObjectCache.php
@@ -1,5 +1,7 @@
 <?php
 /**
+ * Functions to get cache objects
+ *
  * @file
  * @ingroup Cache
  */
@@ -34,7 +36,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 +54,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 +68,8 @@ 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;
+                       } elseif( function_exists( 'wincache_ucache_get' ) ) {
+                               $wgCaches[CACHE_ACCEL] = new WinCacheBagOStuff();
                        } else {
                                $wgCaches[CACHE_ACCEL] = false;
                        }
@@ -91,7 +86,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];
        }