Merge "Move EditPage robot policy out into EditAction"

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 277a6cc..914bad4 100644 (file)
--- 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 643d1c4..9b70994 100644 (file)
--- 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',