From f6d65e533c62f6deb21342d4901ece24497b433e Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Thu, 4 Jun 2015 07:31:04 +0200 Subject: Update to MediaWiki 1.25.1 --- .../SyntaxHighlight_GeSHi/ResourceLoaderGeSHiModule.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'extensions/SyntaxHighlight_GeSHi/ResourceLoaderGeSHiModule.php') diff --git a/extensions/SyntaxHighlight_GeSHi/ResourceLoaderGeSHiModule.php b/extensions/SyntaxHighlight_GeSHi/ResourceLoaderGeSHiModule.php index 63310c5b..98c1c1eb 100644 --- a/extensions/SyntaxHighlight_GeSHi/ResourceLoaderGeSHiModule.php +++ b/extensions/SyntaxHighlight_GeSHi/ResourceLoaderGeSHiModule.php @@ -51,11 +51,16 @@ class ResourceLoaderGeSHiModule extends ResourceLoaderModule { * @return int */ public function getModifiedTime( ResourceLoaderContext $context ) { + static $selfmtime = null; + if ( $selfmtime === null ) { + // Cache this since there are 100s of instances of this module + // See also T93025, T85794. + $selfmtime = self::safeFilemtime( __FILE__ ); + } + return max( array( $this->getDefinitionMtime( $context ), - self::safeFilemtime( __FILE__ ), - self::safeFilemtime( __DIR__ . '/SyntaxHighlight_GeSHi.class.php' ), - self::safeFilemtime( __DIR__ . '/geshi/geshi.php' ), + $selfmtime, self::safeFilemtime( GESHI_LANG_ROOT . "/{$this->lang}.php" ), ) ); } @@ -68,6 +73,7 @@ class ResourceLoaderGeSHiModule extends ResourceLoaderModule { return array( 'class' => get_class( $this ), 'lang' => $this->lang, + 'geshi' => GESHI_VERSION, ); } } -- cgit v1.2.2