From: Brion Vibber <brion@users.mediawiki.org>
Date: Mon, 4 Feb 2008 19:53:21 +0000 (+0000)
Subject: Reverting r30413 for now.
X-Git-Tag: 1.31.0-rc.0~49612
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=cf9cd9dad33740aa788acc7bf4cfc5de771e27c9;p=lhc%2Fweb%2Fwiklou.git

Reverting r30413 for now.
'parentpagename' seems to duplicate 'basepagename'; why?
---

diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index 3f208ea53d..18c931c590 100644
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -91,10 +91,6 @@ class MagicWord {
 		'currentversion',
 		'basepagename',
 		'basepagenamee',
-		'parentpagename',
-		'parentpagenamee',
-		'rootpagename',
-		'rootpagenamee',
 		'urlencode',
 		'currenttimestamp',
 		'localtimestamp',
diff --git a/includes/Parser.php b/includes/Parser.php
index 75050c9838..418792a8e4 100644
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -2454,14 +2454,6 @@ class Parser
 				return wfEscapeWikiText( $this->mTitle->getBaseText() );
 			case 'basepagenamee':
 				return wfUrlEncode( str_replace( ' ', '_', $this->mTitle->getBaseText() ) );
-			case 'parentpagename':
-				return wfEscapeWikiText( $this->mTitle->getBaseText() );
-			case 'parentpagenamee':
-				return wfUrlEncode( str_replace( ' ', '_', $this->mTitle->getBaseText() ) );
-			case 'rootpagename':
-				return wfEscapeWikiText( $this->mTitle->getRootText() );
-			case 'rootpagenamee':
-				return wfUrlEncode( str_replace( ' ', '_', $this->mTitle->getRootText() ) );
 			case 'talkpagename':
 				if( $this->mTitle->canTalk() ) {
 					$talkPage = $this->mTitle->getTalkPage();
diff --git a/includes/Parser_OldPP.php b/includes/Parser_OldPP.php
index 685336cd85..c10de25755 100644
--- a/includes/Parser_OldPP.php
+++ b/includes/Parser_OldPP.php
@@ -2453,15 +2453,7 @@ class Parser_OldPP
 			case 'basepagename':
 				return wfEscapeWikiText( $this->mTitle->getBaseText() );
 			case 'basepagenamee':
-                return wfUrlEncode( str_replace( ' ', '_', $this->mTitle->getBaseText() ) );
-			case 'parentpagename':
-				return wfEscapeWikiText( $this->mTitle->getBaseText() );
-			case 'parentpagenamee':
 				return wfUrlEncode( str_replace( ' ', '_', $this->mTitle->getBaseText() ) );
-			case 'rootpagename':
-				return wfEscapeWikiText( $this->mTitle->getRootText() );
-			case 'rootpagenamee':
-				return wfUrlEncode( str_replace( ' ', '_', $this->mTitle->getRootText() ) );
 			case 'talkpagename':
 				if( $this->mTitle->canTalk() ) {
 					$talkPage = $this->mTitle->getTalkPage();
diff --git a/includes/Title.php b/includes/Title.php
index 9cf3bb085c..b858b2664a 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -682,21 +682,7 @@ class Title {
 		} else {
 			return $this->getText();
 		}
-    }
-
-	/**
-	 * Get the root name, i.e. the leftmost part before the first /
-	 * @return string Root name
-	 */
-	public function getRootText() {
-		global $wgNamespacesWithSubpages;
-		if( !empty( $wgNamespacesWithSubpages[$this->mNamespace] ) ) {
-			$parts = explode( '/', $this->getText() );
-			return $parts[0];
-		} else {
-			return $this->getText();
-		}
-    }
+	}
 
 	/**
 	 * Get the lowest-level subpage name, i.e. the rightmost part after /
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 92e8fbf387..c4ad9b7387 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -261,10 +261,6 @@ $magicWords = array(
 	'subpagenamee'           => array( 1,    'SUBPAGENAMEE'           ),
 	'basepagename'           => array( 1,    'BASEPAGENAME'           ),
 	'basepagenamee'          => array( 1,    'BASEPAGENAMEE'          ),
-	'parentpagename'         => array( 1,    'PARENTPAGENAME'         ),
-	'parentpagenamee'        => array( 1,    'PARENTPAGENAMEE'        ),
-	'rootpagename'           => array( 1,    'ROOTPAGENAME'           ),
-	'rootpagenamee'          => array( 1,    'ROOTPAGENAMEE'          ),
 	'talkpagename'           => array( 1,    'TALKPAGENAME'           ),
 	'talkpagenamee'          => array( 1,    'TALKPAGENAMEE'          ),
 	'subjectpagename'        => array( 1,    'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),