Fixed problems caused by merging of a patch which was generated from an old version

diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index d1271dd..9089d51 100644 (file)
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -42,9 +42,9 @@ 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);
+define("MAG_PAGENAME", 30);
+define("MAG_NAMESPACE", 31);
 
 $wgVariableIDs = array(
        MAG_CURRENTMONTH,

diff --git a/includes/Parser.php b/includes/Parser.php
index 6613832..0a6c347 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -1171,11 +1171,11 @@ class Parser
                                return $wgLang->getMonthNameGen( date("n") );
                        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());
+                       case MAG_CURRENTDAYNAME:
                                return $wgLang->getWeekdayName( date("w")+1 );
                        case MAG_CURRENTYEAR:
                                return date( "Y" );