From 1fe3b4a9d2be2669158b0cc02f2392d8c6eafa96 Mon Sep 17 00:00:00 2001 From: Parent5446 Date: Mon, 2 Dec 2013 21:20:11 +0000 Subject: [PATCH] Revert "Add $robotPolicy parameter to SpecialPage::setHeaders()" This reverts commit 8c7541da3b12d4727743ed1d3447f6ac6c3b6846. Bug: 57883 Change-Id: I582088528286ff34da164fa4457dd203f11df7ef --- includes/OutputPage.php | 9 +++------ includes/SpecialPage.php | 12 +++--------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/includes/OutputPage.php b/includes/OutputPage.php index eae5dfd20c..a0d7e30c97 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -774,12 +774,9 @@ class OutputPage extends ContextSource { /** * Set the robot policy for the page: * - * @param string|array $policy string such as "noindex,nofollow" or an array in this - * format: - * array( - * 'index' => 'noindex' // or 'index' - * 'follow' => 'nofollow' // or 'follow' - * ) + * @param string $policy the literal string to output as the contents of + * the meta tag. Will be parsed according to the spec and output in + * standardized form. * @return null */ public function setRobotPolicy( $policy ) { diff --git a/includes/SpecialPage.php b/includes/SpecialPage.php index 2f0e5e9d97..f70a6dc192 100644 --- a/includes/SpecialPage.php +++ b/includes/SpecialPage.php @@ -640,17 +640,11 @@ class SpecialPage { /** * Sets headers - this should be called from the execute() method of all derived classes! - * @param string|array $robotPolicy string such as "noindex,nofollow" or an array in this - * format: - * array( - * 'index' => 'noindex' // or 'index' - * 'follow' => 'nofollow' // or 'follow' - * ) - */ - function setHeaders( $robotPolicy = "noindex,nofollow" ) { + */ + function setHeaders() { $out = $this->getOutput(); $out->setArticleRelated( false ); - $out->setRobotPolicy( $robotPolicy ); + $out->setRobotPolicy( "noindex,nofollow" ); $out->setPageTitle( $this->getDescription() ); } -- 2.20.1