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
Adds i18n for ApiRollback.php tag parameter
[lhc/web/wiklou.git]
/
includes
/
AjaxResponse.php
diff --git
a/includes/AjaxResponse.php
b/includes/AjaxResponse.php
index
6c2efc2
..
34bb65f
100644
(file)
--- a/
includes/AjaxResponse.php
+++ b/
includes/AjaxResponse.php
@@
-276,13
+276,11
@@
class AjaxResponse {
* @return bool
*/
function loadFromMemcached( $mckey, $touched ) {
* @return bool
*/
function loadFromMemcached( $mckey, $touched ) {
- global $wgMemc;
-
if ( !$touched ) {
return false;
}
if ( !$touched ) {
return false;
}
- $mcvalue =
$wgMemc
->get( $mckey );
+ $mcvalue =
ObjectCache::getMainWANInstance()
->get( $mckey );
if ( $mcvalue ) {
# Check to see if the value has been invalidated
if ( $touched <= $mcvalue['timestamp'] ) {
if ( $mcvalue ) {
# Check to see if the value has been invalidated
if ( $touched <= $mcvalue['timestamp'] ) {
@@
-304,9
+302,7
@@
class AjaxResponse {
* @return bool
*/
function storeInMemcached( $mckey, $expiry = 86400 ) {
* @return bool
*/
function storeInMemcached( $mckey, $expiry = 86400 ) {
- global $wgMemc;
-
- $wgMemc->set( $mckey,
+ ObjectCache::getMainWANInstance()->set( $mckey,
array(
'timestamp' => wfTimestampNow(),
'value' => $this->mText
array(
'timestamp' => wfTimestampNow(),
'value' => $this->mText