From 258740c2df5b6b7fa123f692afe181cb821553e7 Mon Sep 17 00:00:00 2001
From: Aryeh Gregor <simetrical@users.mediawiki.org>
Date: Wed, 23 Jul 2008 19:27:13 +0000
Subject: [PATCH] Revert last commit for a moment, committed lots of stuff I
 didn't mean to.

---
 includes/MagicWord.php            | 4 ----
 includes/parser/Parser.php        | 9 ---------
 includes/parser/ParserOutput.php  | 4 +---
 languages/messages/MessagesEn.php | 2 --
 4 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index ca2a113307..5284e6211b 100644
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -105,8 +105,6 @@ class MagicWord {
 		'numberofadmins',
 		'defaultsort',
 		'pagesincategory',
-		'index',
-		'noindex',
 	);
 
 	/* Array of caching hints for ParserCache */
@@ -155,8 +153,6 @@ class MagicWord {
 		'noeditsection',
 		'newsectionlink',
 		'hiddencat',
-		'index',
-		'noindex',
 	);
 
 
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 404f94aeed..b9e0ceef98 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -3380,15 +3380,6 @@ class Parser
 				wfDebug( __METHOD__.": [[MediaWiki:hidden-category-category]] is not a valid title!\n" );
 			}
 		}
-		# (bug 8068) Allow control over whether robots index a page.  FIXME:
-		# __INDEX__ always overrides __NOINDEX__ here!  This is not desirable,
-		# the last one on the page should win.
-		if( isset( $this->mDoubleUnderscores['noindex'] ) ) {
-			$this->mOutput->setIndexPolicy( 'noindex' );
-		} elseif( isset( $this->mDoubleUnderscores['index'] ) ) {
-			$this->mOutput->setIndexPolicy( 'index' );
-		}
-
 		return $text;
 	}
 
diff --git a/includes/parser/ParserOutput.php b/includes/parser/ParserOutput.php
index 5f69af7576..f98d56418d 100644
--- a/includes/parser/ParserOutput.php
+++ b/includes/parser/ParserOutput.php
@@ -23,8 +23,7 @@ class ParserOutput
 		$mOutputHooks,      # Hook tags as per $wgParserOutputHooks
 		$mWarnings,         # Warning text to be returned to the user. Wikitext formatted, in the key only
 		$mSections,         # Table of contents
-		$mProperties,       # Name/value pairs to be cached in the DB
-		$mIndexPolicy;		# 'index' or 'noindex'?  Default is null
+		$mProperties;       # Name/value pairs to be cached in the DB
 
 	/**
 	 * Overridden title for display
@@ -53,7 +52,6 @@ class ParserOutput
 		$this->mOutputHooks = array();
 		$this->mWarnings = array();
 		$this->mProperties = array();
-		$this->mIndexPolicy = null;
 	}
 
 	function getText()                   { return $this->mText; }
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 1ec6886532..2361b84b62 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -340,8 +340,6 @@ $magicWords = array(
 	'hiddencat'              => array( 1,    '__HIDDENCAT__'          ),
 	'pagesincategory'        => array( 1,    'PAGESINCATEGORY', 'PAGESINCAT' ),
 	'pagesize'               => array( 1,    'PAGESIZE'               ),
-	'index'                  => array( 1,    '__INDEX__'              ),
-	'noindex'                => array( 1,    '__NOINDEX__'            ),
 );
 
 /**
-- 
2.20.1