Merge "Show password-required message only if $wgRequirePasswordforEmailChange =...

[lhc/web/wiklou.git] / includes / interwiki / Interwiki.php

diff --git a/includes/interwiki/Interwiki.php b/includes/interwiki/Interwiki.php
index 2bfe756..7a49f9b 100644 (file)
--- a/includes/interwiki/Interwiki.php
+++ b/includes/interwiki/Interwiki.php
@@ -221,6 +221,8 @@ class Interwiki {
                        function ( $oldValue, &$ttl, array &$setOpts ) use ( $prefix ) {
                                $dbr = wfGetDB( DB_SLAVE );
 
+                               $setOpts += Database::getCacheSetOptions( $dbr );
+
                                $row = $dbr->selectRow(
                                        'interwiki',
                                        Interwiki::selectFields(),
@@ -228,8 +230,6 @@ class Interwiki {
                                        __METHOD__
                                );
 
-                               $setOpts = array( 'since' => $dbr->trxTimestamp() );
-
                                return $row ? (array)$row : '!NONEXISTENT';
                        },
                        $wgInterwikiExpiry