From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Fri, 14 Nov 2008 22:45:32 +0000 (+0000)
Subject: * Removed the inclusion of memcached-client.php since this file is autoloaded
X-Git-Tag: 1.31.0-rc.0~44338
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22articles_versions%22%2C%22id_article=%24id_article%22%29%20.%20%22?a=commitdiff_plain;h=b9b1d9dc6fd0675d8bf6b52f0b6c69bbbd45b53a;p=lhc%2Fweb%2Fwiklou.git

* Removed the inclusion of memcached-client.php since this file is autoloaded
* Document a bit
---

diff --git a/includes/ObjectCache.php b/includes/ObjectCache.php
index 07525acea7..6cfb2340f4 100644
--- a/includes/ObjectCache.php
+++ b/includes/ObjectCache.php
@@ -32,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;
@@ -49,8 +52,7 @@ function &wfGetCache( $inputType ) {
 
 	if ( $type == CACHE_MEMCACHED ) {
 		if ( !array_key_exists( CACHE_MEMCACHED, $wgCaches ) ) {
-			require_once( 'memcached-client.php' );
-			if ( !class_exists("MemcachedClientforWiki") ) {
+			if ( !class_exists( 'MemcachedClientforWiki' ) ) {
 				class MemCachedClientforWiki extends memcached {
 					function _debugprint( $text ) {
 						wfDebug( "memcached: $text" );
@@ -104,18 +106,21 @@ 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 );