Add {{NAMESPACE}} and {{PAGENAME}} magic words. (dori's patch)

diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index 1e1a1f7..d1271dd 100644 (file)
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -42,6 +42,8 @@ define("MAG_NS", 25);
 define("MAG_LOCALURL", 26);
 define("MAG_LOCALURLE", 27);
 define("MAG_SERVER", 28);
+define("MAG_PAGENAME", 29);
+define("MAG_NAMESPACE", 30);
 define("MAG_IMG_FRAMED", 29);
 
 $wgVariableIDs = array(
@@ -54,7 +56,9 @@ $wgVariableIDs = array(
        MAG_NUMBEROFARTICLES,
        MAG_CURRENTMONTHNAMEGEN,
     MAG_SITENAME,
-       MAG_SERVER
+       MAG_SERVER,
+       MAG_PAGENAME,
+       MAG_NAMESPACE
 );
 
 class MagicWord {

diff --git a/includes/Parser.php b/includes/Parser.php
index c413e20..6613832 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -1172,6 +1172,10 @@ class Parser
                        case MAG_CURRENTDAY:
                                return date("j");
                        case MAG_CURRENTDAYNAME:
+                       case MAG_PAGENAME:
+                               return $this->mTitle->getText();
+                       case MAG_NAMESPACE:
+                               return Namespace::getCanonicalName($this->mTitle->getNamespace());
                                return $wgLang->getWeekdayName( date("w")+1 );
                        case MAG_CURRENTYEAR:
                                return date( "Y" );

diff --git a/languages/Language.php b/languages/Language.php
index 2c71ad2..b0e8cd1 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -359,6 +359,8 @@ $wgLanguageNamesEn =& $wgLanguageNames;
     MAG_CURRENTTIME          => array( 1,    "CURRENTTIME"            ),
     MAG_NUMBEROFARTICLES     => array( 1,    "NUMBEROFARTICLES"       ),
     MAG_CURRENTMONTHNAMEGEN  => array( 1,    "CURRENTMONTHNAMEGEN"    ),
+               MAG_PAGENAME             => array( 1,    "PAGENAME"               ),
+               MAG_NAMESPACE            => array( 1,    "NAMESPACE"              ),            
        MAG_MSG                  => array( 0,    "MSG:"                   ),
        MAG_SUBST                => array( 0,    "SUBST:"                 ),
     MAG_MSGNW                => array( 0,    "MSGNW:"                 ),