Add a {{STYLEPATH}} magic word; necessary for upcoming EditToolbar fix

diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index 991a286..8877bac 100644 (file)
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -64,6 +64,7 @@ class MagicWord {
                'server',
                'servername',
                'scriptpath',
+               'stylepath',
                'pagename',
                'pagenamee',
                'fullpagename',

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 20af1c6..7a9bb2a 100644 (file)
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -2298,7 +2298,8 @@ class Parser
         * @private
         */
        function getVariableValue( $index, $frame=false ) {
-               global $wgContLang, $wgSitename, $wgServer, $wgServerName, $wgScriptPath;
+               global $wgContLang, $wgSitename, $wgServer, $wgServerName;
+               global $wgScriptPath, $wgStylePath;
 
                /**
                 * Some of these require message or data lookups and can be
@@ -2513,6 +2514,8 @@ class Parser
                                return $wgServerName;
                        case 'scriptpath':
                                return $wgScriptPath;
+                       case 'stylepath':
+                               return $wgStylePath;
                        case 'directionmark':
                                return $wgContLang->getDirMark();
                        case 'contentlanguage':

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index d69784a..284a5be 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -297,6 +297,7 @@ $magicWords = array(
        'server'                 => array( 0,    'SERVER'                 ),
        'servername'             => array( 0,    'SERVERNAME'             ),
        'scriptpath'             => array( 0,    'SCRIPTPATH'             ),
+       'stylepath'              => array( 0,    'STYLEPATH'              ),
        'grammar'                => array( 0,    'GRAMMAR:'               ),
        'gender'                 => array( 0,    'GENDER:'                ),
        'notitleconvert'         => array( 0,    '__NOTITLECONVERT__', '__NOTC__'),