Use $wgInterwikiExpiry to set the expiry time of interwiki cache

diff --git a/includes/Interwiki.php b/includes/Interwiki.php
index abcef1f..1cd96b5 100644 (file)
--- a/includes/Interwiki.php
+++ b/includes/Interwiki.php
@@ -139,7 +139,7 @@ class Interwiki {
         *
         */
        protected static function load( $prefix ) {
-               global $wgMemc;
+               global $wgMemc, $wgInterwikiExpiry;
                $key = wfMemcKey( 'interwiki', $prefix );
                $mc = $wgMemc->get( $key );
                $iw = false;
@@ -157,12 +157,12 @@ class Interwiki {
                $iw = Interwiki::loadFromArray( $row );
                if( $iw ) {
                        $mc = array( 'iw_url' => $iw->mURL, 'iw_local' => $iw->mLocal, 'iw_trans' => $iw->mTrans );
-                       $wgMemc->add( $key, $mc );
+                       $wgMemc->add( $key, $mc, $wgInterwikiExpiry );
                        return $iw;
                } else {
                        # Pages like "Command & Conquer 3: Kane's Wrath" may keep checking
                        # the prefix. Cache the negative result to avoid extra db hits.
-                       $wgMemc->add( $key, 0 );
+                       $wgMemc->add( $key, 0, $wgInterwikiExpiry );
                }
                return false;
        }