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 "Use descriptive key for array of in a Special:EditWatchlist line"
[lhc/web/wiklou.git]
/
includes
/
objectcache
/
MemcachedBagOStuff.php
diff --git
a/includes/objectcache/MemcachedBagOStuff.php
b/includes/objectcache/MemcachedBagOStuff.php
index
79a6841
..
53edcdd
100644
(file)
--- a/
includes/objectcache/MemcachedBagOStuff.php
+++ b/
includes/objectcache/MemcachedBagOStuff.php
@@
-78,8
+78,8
@@
class MemcachedBagOStuff extends BagOStuff {
}
/**
}
/**
- * @param string $key
* @param mixed $casToken
* @param mixed $casToken
+ * @param string $key
* @param mixed $value
* @param int $exptime
* @return bool
* @param mixed $value
* @param int $exptime
* @return bool
@@
-154,7
+154,7
@@
class MemcachedBagOStuff extends BagOStuff {
if ( $expiry > 2592000 && $expiry < 1000000000 ) {
$expiry = 2592000;
}
if ( $expiry > 2592000 && $expiry < 1000000000 ) {
$expiry = 2592000;
}
- return $expiry;
+ return
(int)
$expiry;
}
/**
}
/**