* (bug 3831) {{NAMESPACEE}} variable

* (bug 3997) {{FULLPAGENAME}} and {{FULLPAGENAMEE}} variables

diff --git a/includes/Parser.php b/includes/Parser.php
index e79a9df..bc39f9a 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -1906,11 +1906,16 @@ class Parser
                                return $this->mTitle->getText();
                        case MAG_PAGENAMEE:
                                return $this->mTitle->getPartialURL();
+                       case MAG_FULLPAGENAME:
+                               return $this->mTitle->getPrefixedText();
+                       case MAG_FULLPAGENAMEE:
+                               return wfUrlencode( $this->mTitle->getPrefixedText() );
                        case MAG_REVISIONID:
                                return $wgArticle->getRevIdFetched();
                        case MAG_NAMESPACE:
-                               # return Namespace::getCanonicalName($this->mTitle->getNamespace());
-                               return $wgContLang->getNsText($this->mTitle->getNamespace()); # Patch by Dori
+                               return $wgContLang->getNsText( $this->mTitle->getNamespace() );
+                       case MAG_NAMESPACEE:
+                               return wfUrlencode( $wgContLang->getNsText( $this->mTitle->getNamespace() ) );
                        case MAG_CURRENTDAYNAME:
                                return $varCache[$index] = $wgContLang->getWeekdayName( date('w')+1 );
                        case MAG_CURRENTYEAR:

diff --git a/languages/Language.php b/languages/Language.php
index 63791cf..b4c716d 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -220,6 +220,9 @@ $wgLanguageNamesEn =& $wgLanguageNames;
        MAG_PAGENAME             => array( 1,    'PAGENAME'               ),
        MAG_PAGENAMEE            => array( 1,    'PAGENAMEE'              ),
        MAG_NAMESPACE            => array( 1,    'NAMESPACE'              ),
+       MAG_NAMESPACEE           => array( 1,    'NAMESPACEE'             ),
+       MAG_FULLPAGENAME         => array( 1,    'FULLPAGENAME'           ),
+       MAG_FULLPAGENAMEE        => array( 1,    'FULLPAGENAMEE'          ),
        MAG_MSG                  => array( 0,    'MSG:'                   ),
        MAG_SUBST                => array( 0,    'SUBST:'                 ),
        MAG_MSGNW                => array( 0,    'MSGNW:'                 ),