http://www.mediawiki.org/wiki/Special:Code/MediaWiki/60987

Revision: 60987
Author:   ialex
Date:     2010-01-12 21:10:12 +0000 (Tue, 12 Jan 2010)

Log Message:
-----------
* Now using $wgExtensionAssetsPath for the path to Configure.js/.css

Modified Paths:
--------------
    trunk/extensions/Configure/CHANGELOG
    trunk/extensions/Configure/Configure.php
    trunk/extensions/Configure/specials/ConfigurationPage.php

Modified: trunk/extensions/Configure/CHANGELOG
===================================================================
--- trunk/extensions/Configure/CHANGELOG        2010-01-12 20:54:26 UTC (rev 
60986)
+++ trunk/extensions/Configure/CHANGELOG        2010-01-12 21:10:12 UTC (rev 
60987)
@@ -1,6 +1,9 @@
 This file lists changes on this extension.
 Localisation updates are done on betawiki and aren't listed here.
 
+0.15.3 - 12 January 2010
+  Now using $wgExtensionAssetsPath for the path to Configure.js/.css.
+
 0.15.2 - 5 January 2010
   scripts/writePHP.php now uses NS_FILE and NS_FILE_TALK rather than NS_IMAGE
   and NS_IMAGE_TALK

Modified: trunk/extensions/Configure/Configure.php
===================================================================
--- trunk/extensions/Configure/Configure.php    2010-01-12 20:54:26 UTC (rev 
60986)
+++ trunk/extensions/Configure/Configure.php    2010-01-12 21:10:12 UTC (rev 
60987)
@@ -18,7 +18,7 @@
        'url' => 'http://www.mediawiki.org/wiki/Extension:Configure',
        'description' => 'Allow authorised users to configure the wiki via a 
web-based interface',
        'descriptionmsg' => 'configure-desc',
-       'version' => '0.15.2',
+       'version' => '0.15.3',
 );
 
 # Configuration part

Modified: trunk/extensions/Configure/specials/ConfigurationPage.php
===================================================================
--- trunk/extensions/Configure/specials/ConfigurationPage.php   2010-01-12 
20:54:26 UTC (rev 60986)
+++ trunk/extensions/Configure/specials/ConfigurationPage.php   2010-01-12 
21:10:12 UTC (rev 60987)
@@ -896,12 +896,12 @@
         * Inject JavaScripts and Stylesheets in page output
         */
        protected function injectScriptsAndStyles() {
-               global $wgOut, $wgScriptPath, $wgConfigureStyleVersion, 
$wgConfigureAddJsVariables;
+               global $wgOut, $wgExtensionAssetsPath, 
$wgConfigureStyleVersion, $wgConfigureAddJsVariables;
 
                $wgConfigureAddJsVariables = true; // tell 
efConfigureMakeGlobalVariablesScript() to add JS variables
 
-               $wgOut->addExtensionStyle( 
"{$wgScriptPath}/extensions/Configure/Configure.css?{$wgConfigureStyleVersion}" 
);
-               $wgOut->addScriptFile( 
"{$wgScriptPath}/extensions/Configure/Configure.js?{$wgConfigureStyleVersion}" 
);
+               $wgOut->addExtensionStyle( 
"{$wgExtensionAssetsPath}/Configure/Configure.css?{$wgConfigureStyleVersion}" );
+               $wgOut->addScriptFile( 
"{$wgExtensionAssetsPath}/Configure/Configure.js?{$wgConfigureStyleVersion}" );
        }
 
        /**



_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to