r59458 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r59457‎ | r59458 | r59459 >
Date:16:23, 26 November 2009
Author:ialex
Status:deferred
Tags:
Comment:
Same as r59457; replaced call to OutputPage::addScriptClass() with OutputPage::addScriptFile()
Modified paths:
  • /trunk/extensions/Configure/CHANGELOG (modified) (history)
  • /trunk/extensions/Configure/Configure.page.php (modified) (history)
  • /trunk/extensions/Configure/Configure.php (modified) (history)

Diff [purge]

Index: trunk/extensions/Configure/Configure.page.php
@@ -894,12 +894,12 @@
895895 * Inject JavaScripts and Stylesheets in page output
896896 */
897897 protected function injectScriptsAndStyles() {
898 - global $wgOut, $wgScriptPath, $wgJsMimeType, $wgConfigureStyleVersion, $wgConfigureAddJsVariables;
 898+ global $wgOut, $wgScriptPath, $wgConfigureStyleVersion, $wgConfigureAddJsVariables;
899899
900900 $wgConfigureAddJsVariables = true; // tell efConfigureMakeGlobalVariablesScript() to add JS variables
901901
902902 $wgOut->addExtensionStyle( "{$wgScriptPath}/extensions/Configure/Configure.css?{$wgConfigureStyleVersion}" );
903 - $wgOut->addScriptClass( 'Configure' );
 903+ $wgOut->addScriptFile( "{$wgScriptPath}/extensions/Configure/Configure.js?{$wgConfigureStyleVersion}" );
904904 }
905905
906906 /**
Index: trunk/extensions/Configure/CHANGELOG
@@ -1,6 +1,9 @@
22 This file lists changes on this extension.
33 Localisation updates are done on betawiki and aren't listed here.
44
 5+0.14.15 - 26 November 2009
 6+ Removed ScriptLoader usage (removed from MediaWiki).
 7+
58 0.14.14 - 19 September 2009
69 Updated Collection, FlaggedRevs and OggHandler extensions.
710
Index: trunk/extensions/Configure/Configure.php
@@ -18,7 +18,7 @@
1919 'url' => 'http://www.mediawiki.org/wiki/Extension:Configure',
2020 'description' => 'Allow authorised users to configure the wiki via a web-based interface',
2121 'descriptionmsg' => 'configure-desc',
22 - 'version' => '0.14.14',
 22+ 'version' => '0.14.15',
2323 );
2424
2525 # Configuration part
@@ -284,5 +284,4 @@
285285 $wgAjaxExportList[] = 'efConfigureAjax';
286286
287287 # JS stuff
288 -$wgJSAutoloadClasses['Configure'] = 'extensions/Configure/Configure.js';
289288 $wgHooks['MakeGlobalVariablesScript'][] = 'efConfigureMakeGlobalVariablesScript';

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r59457Fix fatal error since r59446: replace call to OutputPage::addScriptClass() wi...ialex16:10, 26 November 2009

Status & tagging log