X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FObjectCache.php;h=d4f5084769db4b9a2e887445a23c3b28452445c4;hb=a039be051b946c4a25b04009b693f486b71ea90a;hp=2e0fedc791be7763c8baa17968ebcfdb63312164;hpb=3444f2926e97847635e7b513f28606f905b1cdc3;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/ObjectCache.php b/includes/ObjectCache.php
index 2e0fedc791..d4f5084769 100644
--- a/includes/ObjectCache.php
+++ b/includes/ObjectCache.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @addtogroup Cache
+ * @file
+ * @ingroup Cache
  */
 
 /**
@@ -8,7 +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.
- * @addtogroup Cache
+ * @ingroup Cache
  */
 class FakeMemCachedClient {
 	function add ($key, $val, $exp = 0) { return true; }
@@ -31,7 +32,10 @@ class FakeMemCachedClient {
 global $wgCaches;
 $wgCaches = array();
 
-/** @todo document */
+/**
+ * Get a cache object.
+ * @param int $inputType cache type, one the the CACHE_* constants. 
+ */
 function &wfGetCache( $inputType ) {
 	global $wgCaches, $wgMemCachedServers, $wgMemCachedDebug, $wgMemCachedPersistent;
 	$cache = false;
@@ -47,23 +51,20 @@ function &wfGetCache( $inputType ) {
 	}
 
 	if ( $type == CACHE_MEMCACHED ) {
-		if ( !array_key_exists( CACHE_MEMCACHED, $wgCaches ) ){
-			require_once( 'memcached-client.php' );
-
-			if (!class_exists("MemcachedClientforWiki")) {
+		if ( !array_key_exists( CACHE_MEMCACHED, $wgCaches ) ) {
+			if ( !class_exists( 'MemCachedClientforWiki' ) ) {
 				class MemCachedClientforWiki extends memcached {
 					function _debugprint( $text ) {
 						wfDebug( "memcached: $text" );
 					}
 				}
 			}
-
-			$wgCaches[CACHE_DB] = new MemCachedClientforWiki(
+			$wgCaches[CACHE_MEMCACHED] = new MemCachedClientforWiki(
 				array('persistant' => $wgMemCachedPersistent, 'compress_threshold' => 1500 ) );
-			$cache =& $wgCaches[CACHE_DB];
-			$cache->set_servers( $wgMemCachedServers );
-			$cache->set_debug( $wgMemCachedDebug );
+			$wgCaches[CACHE_MEMCACHED]->set_servers( $wgMemCachedServers );
+			$wgCaches[CACHE_MEMCACHED]->set_debug( $wgMemCachedDebug );
 		}
+		$cache =& $wgCaches[CACHE_MEMCACHED];
 	} elseif ( $type == CACHE_ACCEL ) {
 		if ( !array_key_exists( CACHE_ACCEL, $wgCaches ) ) {
 			if ( function_exists( 'eaccelerator_get' ) ) {
@@ -87,10 +88,10 @@ function &wfGetCache( $inputType ) {
 		}
 		$cache =& $wgCaches[CACHE_DBA];
 	}
-	
+
 	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];
 	}
@@ -105,22 +106,23 @@ function &wfGetCache( $inputType ) {
 	return $cache;
 }
 
+/** Get the main cache object */
 function &wfGetMainCache() {
 	global $wgMainCacheType;
 	$ret =& wfGetCache( $wgMainCacheType );
 	return $ret;
 }
 
+/** Get the cache object used by the message cache */
 function &wfGetMessageCacheStorage() {
 	global $wgMessageCacheType;
 	$ret =& wfGetCache( $wgMessageCacheType );
 	return $ret;
 }
 
+/** Get the cache object used by the parser cache */
 function &wfGetParserCacheStorage() {
 	global $wgParserCacheType;
 	$ret =& wfGetCache( $wgParserCacheType );
 	return $ret;
 }
-
-