From f0f5a17d5b38dedfb82aeeb43b7371ee2152e51d Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Sat, 24 Apr 2004 20:19:05 +0000 Subject: [PATCH] Add {{NAMESPACE}} and {{PAGENAME}} magic words. (dori's patch) --- includes/MagicWord.php | 6 +++++- includes/Parser.php | 4 ++++ languages/Language.php | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/includes/MagicWord.php b/includes/MagicWord.php index 1e1a1f72a7..d1271dd5ab 100644 --- 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 c413e2056b..6613832292 100644 --- 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 2c71ad20dd..b0e8cd1df6 100644 --- 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:" ), -- 2.20.1