* MAG_PATH renamed to MAG_SCRIPTPATH

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 865c898..a87cc87 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -297,7 +297,7 @@ Various bugfixes, small features, and a few experimental things:
 * (bug 2277) Added Friulian language file
 * (bug 2457) The "Special page" href now links to the current special page
   rather than to "".
-* A new magic word, {{PATH}}, returns $wgScriptPath
+* A new magic word, {{SCRIPTPATH}}, returns $wgScriptPath
 * Special:Imagelist displays titles with " " instead of "_"
 * Less gratuitous munging of content sample in delete summary
 * badaccess/badaccesstext to supercede sysop*, developer* messages

diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index a0bff75..b281882 100644 (file)
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -52,7 +52,7 @@ define('MAG_NOCONTENTCONVERT',                37);
 define('MAG_CURRENTWEEK',              38);
 define('MAG_CURRENTDOW',               39);
 define('MAG_REVISIONID',               40);
-define('MAG_PATH',                     41);
+define('MAG_SCRIPTPATH',               41);
 
 $wgVariableIDs = array(
        MAG_CURRENTMONTH,
@@ -66,7 +66,7 @@ $wgVariableIDs = array(
        MAG_NUMBEROFARTICLES,
        MAG_SITENAME,
        MAG_SERVER,
-       MAG_PATH,
+       MAG_SCRIPTPATH,
        MAG_PAGENAME,
        MAG_PAGENAMEE,
        MAG_NAMESPACE,

diff --git a/includes/Parser.php b/includes/Parser.php
index 0d1afd7..487c0ca 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -1889,7 +1889,7 @@ class Parser
                                return $wgSitename;
                        case MAG_SERVER:
                                return $wgServer;
-                       case MAG_PATH:
+                       case MAG_SCRIPTPATH:
                                return $wgScriptPath;
                        default:
                                return NULL;

diff --git a/languages/Language.php b/languages/Language.php
index 3fd52b5..6c65200 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -230,7 +230,7 @@ $wgLanguageNamesEn =& $wgLanguageNames;
        MAG_LOCALURL             => array( 0,    'LOCALURL:'              ),
        MAG_LOCALURLE            => array( 0,    'LOCALURLE:'             ),
        MAG_SERVER               => array( 0,    'SERVER'                 ),
-       MAG_PATH                 => array( 0,    'PATH'                   ),
+       MAG_SCRIPTPATH           => array( 0,    'SCRIPTPATH'             ),
        MAG_GRAMMAR              => array( 0,    'GRAMMAR:'               ),
        MAG_NOTITLECONVERT       => array( 0,    '__NOTITLECONVERT__', '__NOTC__'),
        MAG_NOCONTENTCONVERT     => array( 0,    '__NOCONTENTCONVERT__', '__NOCC__'),