Don't use $wgTranscludeCacheExpiry, as it's not designed for this. Make new configura...

diff --git a/includes/filerepo/File.php b/includes/filerepo/File.php
index 169ae86..07a7701 100644 (file)
--- a/includes/filerepo/File.php
+++ b/includes/filerepo/File.php
@@ -1080,7 +1080,7 @@ abstract class File {
                        }
                        wfDebug( "Fetching shared description from $renderUrl\n" );
                        $res = Http::get( $renderUrl );
-                       if ( $res && $this->repo->useLocalCache ) $wgMemc->set( $key, $res, time() + $wgTranscludeCacheExpiry );
+                       if ( $res && $this->repo->useLocalCache ) $wgMemc->set( $key, $res, $this->repo->localCacheExpiry );
                        return $res;
                } else {
                        return false;

diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php
index ca79685..b6318d6 100644 (file)
--- a/includes/filerepo/FileRepo.php
+++ b/includes/filerepo/FileRepo.php
@@ -30,7 +30,8 @@ abstract class FileRepo {
                // Optional settings
                $this->initialCapital = true; // by default
                foreach ( array( 'descBaseUrl', 'scriptDirUrl', 'articleUrl', 'fetchDescription',
-                       'thumbScriptUrl', 'initialCapital', 'pathDisclosureProtection', 'useLocalCache' ) as $var )
+                       'thumbScriptUrl', 'initialCapital', 'pathDisclosureProtection', 
+                       'useLocalCache', 'localCacheExpiry' ) as $var )
                {
                        if ( isset( $info[$var] ) ) {
                                $this->$var = $info[$var];