diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2012-05-03 13:01:35 +0200 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2012-05-03 13:01:35 +0200 |
commit | d9022f63880ce039446fba8364f68e656b7bf4cb (patch) | |
tree | 16b40fbf17bf7c9ee6f4ead25b16dd192378050a /includes/objectcache/ObjectCache.php | |
parent | 27cf83d177256813e2e802241085fce5dd0f3fb9 (diff) |
Update to MediaWiki 1.19.0
Diffstat (limited to 'includes/objectcache/ObjectCache.php')
-rw-r--r-- | includes/objectcache/ObjectCache.php | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/includes/objectcache/ObjectCache.php b/includes/objectcache/ObjectCache.php index 99e38953..77ca8371 100644 --- a/includes/objectcache/ObjectCache.php +++ b/includes/objectcache/ObjectCache.php @@ -43,7 +43,7 @@ class ObjectCache { global $wgObjectCaches; if ( !isset( $wgObjectCaches[$id] ) ) { - throw new MWException( "Invalid object cache type \"$id\" requested. " . + throw new MWException( "Invalid object cache type \"$id\" requested. " . "It is not present in \$wgObjectCaches." ); } @@ -89,9 +89,7 @@ class ObjectCache { * @return ObjectCache */ static function newAccelerator( $params ) { - if ( function_exists( 'eaccelerator_get' ) ) { - $id = 'eaccelerator'; - } elseif ( function_exists( 'apc_fetch') ) { + if ( function_exists( 'apc_fetch') ) { $id = 'apc'; } elseif( function_exists( 'xcache_get' ) && wfIniGetBool( 'xcache.var_size' ) ) { $id = 'xcache'; @@ -106,11 +104,11 @@ class ObjectCache { /** * Factory function that creates a memcached client object. - * The idea of this is that it might eventually detect and automatically + * The idea of this is that it might eventually detect and automatically * support the PECL extension, assuming someone can get it to compile. * * @param $params array - * + * * @return MemcachedPhpBagOStuff */ static function newMemcached( $params ) { |