r58954 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r58953‎ | r58954 | r58955 >
Date:16:46, 12 November 2009
Author:werdna
Status:deferred
Tags:
Comment:
LiquidThreads live-hack, to be replaced later, fixing issue with LiquidThreads_alpha on WMF where the wrong JS files were being loaded
Modified paths:
  • /branches/wmf-deployment/extensions/LiquidThreads_alpha/classes/View.php (modified) (history)

Diff [purge]

Index: branches/wmf-deployment/extensions/LiquidThreads_alpha/classes/View.php
@@ -790,18 +790,25 @@
791791 global $wgOut;
792792 global $wgScriptPath, $wgStyleVersion;
793793 global $wgEnableJS2system;
 794+
 795+ $extRoot = "{$wgScriptPath}/extensions/LiquidThreads";
 796+
 797+ // WMF hack
 798+ if ( !empty($wmgLiquidThreadsAlpha) ) {
 799+ $extRoot = "{$wgScriptPath}/extensions/LiquidThreads_alpha";
 800+ }
794801
795802 $wgOut->addInlineScript( 'var wgLqtMessages = ' . self::exportJSLocalisation() . ';' );
796803
797804 if ( !$wgEnableJS2system ) {
798 - $wgOut->addScriptFile( "{$wgScriptPath}/extensions/LiquidThreads/jquery/js2.combined.js" );
799 - $wgOut->addExtensionStyle( "{$wgScriptPath}/extensions/LiquidThreads/jquery/jquery-ui-1.7.2.css" );
 805+ $wgOut->addScriptFile( "$extRoot/jquery/js2.combined.js" );
 806+ $wgOut->addExtensionStyle( "$extRoot/jquery/jquery-ui-1.7.2.css" );
800807 }
801808
802 - $wgOut->addScriptFile( "{$wgScriptPath}/extensions/LiquidThreads/jquery/jquery.autogrow.js" );
 809+ $wgOut->addScriptFile( "$extRoot/jquery/jquery.autogrow.js" );
803810
804 - $wgOut->addScriptFile( "{$wgScriptPath}/extensions/LiquidThreads/lqt.js" );
805 - $wgOut->addExtensionStyle( "{$wgScriptPath}/extensions/LiquidThreads/lqt.css?{$wgStyleVersion}" );
 811+ $wgOut->addScriptFile( "$extRoot/lqt.js" );
 812+ $wgOut->addExtensionStyle( "$extRoot/lqt.css?{$wgStyleVersion}" );
806813
807814 self::$stylesAndScriptsDone = true;
808815 }

Status & tagging log