From: Alex Monk <krenair@gmail.com>
Date: Fri, 5 Feb 2016 02:17:43 +0000 (+0000)
Subject: Move EditPage robot policy out into EditAction
X-Git-Tag: 1.31.0-rc.0~8054^2
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=d4ca1fd7f252fa6fd6a8c75a47682fa8f5c361c2;p=lhc%2Fweb%2Fwiklou.git

Move EditPage robot policy out into EditAction

So that it's default even when CustomEditor is used

Bug: T126145
Change-Id: If49d1dc39fb6ad9a2a0fa507ea9a0ccdc1088c59
---

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 277a6cc6d8..914bad4743 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2232,8 +2232,6 @@ class EditPage {
 			$wgOut->addModules( 'mediawiki.action.edit.stash' );
 		}
 
-		$wgOut->setRobotPolicy( 'noindex,nofollow' );
-
 		# Enabled article-related sidebar, toplinks, etc.
 		$wgOut->setArticleRelated( true );
 
diff --git a/includes/actions/EditAction.php b/includes/actions/EditAction.php
index 643d1c4d1c..9b70994741 100644
--- a/includes/actions/EditAction.php
+++ b/includes/actions/EditAction.php
@@ -43,8 +43,9 @@ class EditAction extends FormlessAction {
 	public function show() {
 		$this->useTransactionalTimeLimit();
 
+		$out = $this->getOutput();
+		$out->setRobotPolicy( 'noindex,nofollow' );
 		if ( $this->getContext()->getConfig()->get( 'UseMediaWikiUIEverywhere' ) ) {
-			$out = $this->getOutput();
 			$out->addModuleStyles( array(
 				'mediawiki.ui.input',
 				'mediawiki.ui.checkbox',