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 "Remove unused mw.Upload.BookletLayout messages"
[lhc/web/wiklou.git]
/
includes
/
User.php
diff --git
a/includes/User.php
b/includes/User.php
index
e523b68
..
75649a7
100644
(file)
--- a/
includes/User.php
+++ b/
includes/User.php
@@
-458,7
+458,7
@@
class User implements IDBAccessObject {
$data['mVersion'] = self::VERSION;
$key = wfMemcKey( 'user', 'id', $this->mId );
$data['mVersion'] = self::VERSION;
$key = wfMemcKey( 'user', 'id', $this->mId );
- $opts =
array( 'since' => wfGetDB( DB_SLAVE )->trxTimestamp(
) );
+ $opts =
Database::getCacheSetOptions( wfGetDB( DB_SLAVE
) );
ObjectCache::getMainWANInstance()->set( $key, $data, 3600, $opts );
}
ObjectCache::getMainWANInstance()->set( $key, $data, 3600, $opts );
}