* Fix WebRequest.php

[lhc/web/wiklou.git] / includes / ObjectCache.php

diff --git a/includes/ObjectCache.php b/includes/ObjectCache.php
index d851f3a..01b61df 100644 (file)
--- a/includes/ObjectCache.php
+++ b/includes/ObjectCache.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * @package MediaWiki
- * @subpackage Cache
+ * @file
+ * @ingroup Cache
  */
 
 /**
@@ -9,8 +9,7 @@
  * It acts as a memcached server with no RAM, that is, all objects are
  * cleared the moment they are set. All set operations succeed and all
  * get operations return null.
- * @package MediaWiki
- * @subpackage Cache
+ * @ingroup Cache
  */
 class FakeMemCachedClient {
        function add ($key, $val, $exp = 0) { return true; }
@@ -33,91 +32,94 @@ class FakeMemCachedClient {
 global $wgCaches;
 $wgCaches = array();
 
-class ObjectCacheManager {
-       /* @static */
-       function getCache( $inputType ) {
-               global $wgCaches, $wgMemCachedServers, $wgMemCachedDebug, $wgMemCachedPersistent;
-               $cache = false;
+/** @todo document */
+function &wfGetCache( $inputType ) {
+       global $wgCaches, $wgMemCachedServers, $wgMemCachedDebug, $wgMemCachedPersistent;
+       $cache = false;
 
-               if ( $inputType == CACHE_ANYTHING ) {
-                       reset( $wgCaches );
-                       $type = key( $wgCaches );
-                       if ( $type === false || $type === CACHE_NONE ) {
-                               $type = CACHE_DB;
-                       }
-               } else {
-                       $type = $inputType;
+       if ( $inputType == CACHE_ANYTHING ) {
+               reset( $wgCaches );
+               $type = key( $wgCaches );
+               if ( $type === false || $type === CACHE_NONE ) {
+                       $type = CACHE_DB;
                }
+       } else {
+               $type = $inputType;
+       }
 
-               if ( $type == CACHE_MEMCACHED ) {
-                       if ( !array_key_exists( CACHE_MEMCACHED, $wgCaches ) ){
-                               $wgCaches[CACHE_DB] = new MemCachedClientforWiki(
-                                       array('persistant' => $wgMemCachedPersistent, 'compress_threshold' => 1500 ) );
-                               $cache =& $wgCaches[CACHE_DB];
-                               $cache->set_servers( $wgMemCachedServers );
-                               $cache->set_debug( $wgMemCachedDebug );
-                       }
-               } elseif ( $type == CACHE_ACCEL ) {
-                       if ( !array_key_exists( CACHE_ACCEL, $wgCaches ) ) {
-                               if ( function_exists( 'eaccelerator_get' ) ) {
-                                       $wgCaches[CACHE_ACCEL] = new eAccelBagOStuff;
-                               } elseif ( function_exists( 'apc_fetch') ) {
-                                       $wgCaches[CACHE_ACCEL] = new APCBagOStuff;
-                               } elseif ( function_exists( 'mmcache_get' ) ) {
-                                       $wgCaches[CACHE_ACCEL] = new TurckBagOStuff;
-                               } else {
-                                       $wgCaches[CACHE_ACCEL] = false;
+       if ( $type == CACHE_MEMCACHED ) {
+               if ( !array_key_exists( CACHE_MEMCACHED, $wgCaches ) ){
+                       require_once( 'memcached-client.php' );
+
+                       if (!class_exists("MemcachedClientforWiki")) {
+                               class MemCachedClientforWiki extends memcached {
+                                       function _debugprint( $text ) {
+                                               wfDebug( "memcached: $text" );
+                                       }
                                }
                        }
-                       if ( $wgCaches[CACHE_ACCEL] !== false ) {
-                               $cache =& $wgCaches[CACHE_ACCEL];
-                       }
-               }
 
-               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 MemCachedClientforWiki(
+                               array('persistant' => $wgMemCachedPersistent, 'compress_threshold' => 1500 ) );
                        $cache =& $wgCaches[CACHE_DB];
+                       $cache->set_servers( $wgMemCachedServers );
+                       $cache->set_debug( $wgMemCachedDebug );
                }
-
-               if ( $cache === false ) {
-                       if ( !array_key_exists( CACHE_NONE, $wgCaches ) ) {
-                               $wgCaches[CACHE_NONE] = new FakeMemCachedClient;
+       } elseif ( $type == CACHE_ACCEL ) {
+               if ( !array_key_exists( CACHE_ACCEL, $wgCaches ) ) {
+                       if ( function_exists( 'eaccelerator_get' ) ) {
+                               $wgCaches[CACHE_ACCEL] = new eAccelBagOStuff;
+                       } elseif ( function_exists( 'apc_fetch') ) {
+                               $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;
                        }
-                       $cache =& $wgCaches[CACHE_NONE];
                }
-
-               return $cache;
-       }
-       
-       /** @static */
-       function &getMainCache() {
-               global $wgMainCacheType;
-               $ret =& ObjectCacheManager::getCache( $wgMainCacheType );
-               return $ret;
+               if ( $wgCaches[CACHE_ACCEL] !== false ) {
+                       $cache =& $wgCaches[CACHE_ACCEL];
+               }
+       } elseif ( $type == CACHE_DBA ) {
+               if ( !array_key_exists( CACHE_DBA, $wgCaches ) ) {
+                       $wgCaches[CACHE_DBA] = new DBABagOStuff;
+               }
+               $cache =& $wgCaches[CACHE_DBA];
        }
 
-       /** @static */
-       function &getMessageCache() {
-               global $wgMessageCacheType;
-               $ret =& ObjectCacheManager::getCache( $wgMessageCacheType );
-               return $ret;
+       if ( $type == CACHE_DB || ( $inputType == CACHE_ANYTHING && $cache === false ) ) {
+               if ( !array_key_exists( CACHE_DB, $wgCaches ) ) {
+                       $wgCaches[CACHE_DB] = new MediaWikiBagOStuff('objectcache');
+               }
+               $cache =& $wgCaches[CACHE_DB];
        }
-       
-       /** @static */
-       function &getParserCache() {
-               global $wgParserCacheType;
-               $ret =& ObjectCacheManager::getCache( $wgParserCacheType );
-               return $ret;
+
+       if ( $cache === false ) {
+               if ( !array_key_exists( CACHE_NONE, $wgCaches ) ) {
+                       $wgCaches[CACHE_NONE] = new FakeMemCachedClient;
+               }
+               $cache =& $wgCaches[CACHE_NONE];
        }
-       
+
+       return $cache;
 }
 
-class MemCachedClientforWiki extends memcached {
-       function _debugprint( $text ) {
-               wfDebug( "memcached: $text\n" );
-       }
+function &wfGetMainCache() {
+       global $wgMainCacheType;
+       $ret =& wfGetCache( $wgMainCacheType );
+       return $ret;
 }
 
-?>
+function &wfGetMessageCacheStorage() {
+       global $wgMessageCacheType;
+       $ret =& wfGetCache( $wgMessageCacheType );
+       return $ret;
+}
+
+function &wfGetParserCacheStorage() {
+       global $wgParserCacheType;
+       $ret =& wfGetCache( $wgParserCacheType );
+       return $ret;
+}