From 4ac9fa081a7c045f6a9f1cfc529d82423f485b2e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 8 Dec 2013 09:55:49 +0100
Subject: Update to MediaWiki 1.22.0

---
 includes/objectcache/ObjectCache.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'includes/objectcache/ObjectCache.php')

diff --git a/includes/objectcache/ObjectCache.php b/includes/objectcache/ObjectCache.php
index eafa836a..6c1433a9 100644
--- a/includes/objectcache/ObjectCache.php
+++ b/includes/objectcache/ObjectCache.php
@@ -34,7 +34,7 @@ class ObjectCache {
 	 *
 	 * @param $id string
 	 *
-	 * @return ObjectCache
+	 * @return BagOStuff
 	 */
 	static function getInstance( $id ) {
 		if ( isset( self::$instances[$id] ) ) {
@@ -59,7 +59,7 @@ class ObjectCache {
 	 * @param $id string
 	 *
 	 * @throws MWException
-	 * @return ObjectCache
+	 * @return BagOStuff
 	 */
 	static function newFromId( $id ) {
 		global $wgObjectCaches;
@@ -78,7 +78,7 @@ class ObjectCache {
 	 * @param $params array
 	 *
 	 * @throws MWException
-	 * @return ObjectCache
+	 * @return BagOStuff
 	 */
 	static function newFromParams( $params ) {
 		if ( isset( $params['factory'] ) ) {
@@ -102,7 +102,7 @@ class ObjectCache {
 	 * If no cache choice is configured (by default $wgMainCacheType is CACHE_NONE),
 	 * then CACHE_ANYTHING will forward to CACHE_DB.
 	 * @param $params array
-	 * @return ObjectCache
+	 * @return BagOStuff
 	 */
 	static function newAnything( $params ) {
 		global $wgMainCacheType, $wgMessageCacheType, $wgParserCacheType;
@@ -120,14 +120,14 @@ class ObjectCache {
 	 *
 	 * @param $params array
 	 * @throws MWException
-	 * @return ObjectCache
+	 * @return BagOStuff
 	 */
 	static function newAccelerator( $params ) {
 		if ( function_exists( 'apc_fetch' ) ) {
 			$id = 'apc';
-		} elseif( function_exists( 'xcache_get' ) && wfIniGetBool( 'xcache.var_size' ) ) {
+		} elseif ( function_exists( 'xcache_get' ) && wfIniGetBool( 'xcache.var_size' ) ) {
 			$id = 'xcache';
-		} elseif( function_exists( 'wincache_ucache_get' ) ) {
+		} elseif ( function_exists( 'wincache_ucache_get' ) ) {
 			$id = 'wincache';
 		} else {
 			throw new MWException( "CACHE_ACCEL requested but no suitable object " .
-- 
cgit v1.2.3-54-g00ecf