Merge "Clear previously left-over PQresult before calling pg_get_result()"

[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 );
 
-               $opts = array( 'since' => wfGetDB( DB_SLAVE )->trxTimestamp() );
+               $opts = Database::getCacheSetOptions( wfGetDB( DB_SLAVE ) );
                ObjectCache::getMainWANInstance()->set( $key, $data, 3600, $opts );
        }