dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Removed 'Remember my login' preference"
[lhc/web/wiklou.git]
/
includes
/
objectcache
/
ObjectCache.php
diff --git
a/includes/objectcache/ObjectCache.php
b/includes/objectcache/ObjectCache.php
index
eafa836
..
6c1433a
100644
(file)
--- a/
includes/objectcache/ObjectCache.php
+++ b/
includes/objectcache/ObjectCache.php
@@
-34,7
+34,7
@@
class ObjectCache {
*
* @param $id string
*
*
* @param $id string
*
- * @return
ObjectCache
+ * @return
BagOStuff
*/
static function getInstance( $id ) {
if ( isset( self::$instances[$id] ) ) {
*/
static function getInstance( $id ) {
if ( isset( self::$instances[$id] ) ) {
@@
-59,7
+59,7
@@
class ObjectCache {
* @param $id string
*
* @throws MWException
* @param $id string
*
* @throws MWException
- * @return
ObjectCache
+ * @return
BagOStuff
*/
static function newFromId( $id ) {
global $wgObjectCaches;
*/
static function newFromId( $id ) {
global $wgObjectCaches;
@@
-78,7
+78,7
@@
class ObjectCache {
* @param $params array
*
* @throws MWException
* @param $params array
*
* @throws MWException
- * @return
ObjectCache
+ * @return
BagOStuff
*/
static function newFromParams( $params ) {
if ( isset( $params['factory'] ) ) {
*/
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
* 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;
*/
static function newAnything( $params ) {
global $wgMainCacheType, $wgMessageCacheType, $wgParserCacheType;
@@
-120,14
+120,14
@@
class ObjectCache {
*
* @param $params array
* @throws MWException
*
* @param $params array
* @throws MWException
- * @return
ObjectCache
+ * @return
BagOStuff
*/
static function newAccelerator( $params ) {
if ( function_exists( 'apc_fetch' ) ) {
$id = 'apc';
*/
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';
$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 " .
$id = 'wincache';
} else {
throw new MWException( "CACHE_ACCEL requested but no suitable object " .