Merge "Use OutputPage::addWikiTextAsInterface() instead of untidy addWikiText()"

diff --combined includes/OutputPage.php
index 0cff578,d3a8d0c..3a0a529
--- 1/includes/OutputPage.php
--- 2/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@@ -2460,7 -2460,6 +2460,7 @@@ class OutputPage extends ContextSource 
                                !$this->haveCacheVaryCookies()
                        ) {
                                if ( $config->get( 'UseESI' ) ) {
 +                                      wfDeprecated( '$wgUseESI = true', '1.33' );
                                        # We'll purge the proxy cache explicitly, but require end user agents
                                        # to revalidate against the proxy on each visit.
                                        # Surrogate-Control controls our CDN, Cache-Control downstream caches
@@@ -2774,7 -2773,7 +2774,7 @@@
                        }
                } else {
                        $this->prepareErrorPage( $this->msg( 'permissionserrors' ) );
-                       $this->addWikiText( $this->formatPermissionsErrorMessage( $errors, $action ) );
+                       $this->addWikiTextAsInterface( $this->formatPermissionsErrorMessage( $errors, $action ) );
                }
        }
  
@@@ -4045,7 -4044,7 +4045,7 @@@
         *
         * Is equivalent to:
         *
-        *    $wgOut->addWikiText( "<div class='error'>\n"
+        *    $wgOut->addWikiTextAsInterface( "<div class='error'>\n"
         *        . wfMessage( 'some-error' )->plain() . "\n</div>" );
         *
         * The newline after the opening div is needed in some wikitext. See T21226.
@@@ -4074,7 -4073,7 +4074,7 @@@
                        }
                        $s = str_replace( '$' . ( $n + 1 ), $this->msg( $name, $args )->plain(), $s );
                }
-               $this->addWikiText( $s );
+               $this->addWikiTextAsInterface( $s );
        }
  
        /**

diff --combined includes/page/Article.php
index 36632f0,8bc8d1e..e528929
--- 1/includes/page/Article.php
--- 2/includes/page/Article.php
+++ b/includes/page/Article.php
@@@ -120,7 -120,7 +120,7 @@@ class Article implements Page 
         * here, there doesn't seem to be any other way to stop calling
         * OutputPage::enableSectionEditLinks() and still have it work as it did before.
         */
 -      private $disableSectionEditForRender = false;
 +      protected $viewIsRenderAction = false;
  
        /**
         * Constructor and clear the article
@@@ -633,7 -633,7 +633,7 @@@
                if ( $outputPage->isPrintable() ) {
                        $parserOptions->setIsPrintable( true );
                        $poOptions['enableSectionEditLinks'] = false;
 -              } elseif ( $this->disableSectionEditForRender
 +              } elseif ( $this->viewIsRenderAction
                        || !$this->isCurrent() || !$this->getTitle()->quickUserCan( 'edit', $user )
                ) {
                        $poOptions['enableSectionEditLinks'] = false;
@@@ -792,7 -792,7 +792,7 @@@
                                                        $outputPage->setRobotPolicy( 'noindex,nofollow' );
  
                                                        $errortext = $error->getWikiText( false, 'view-pool-error' );
-                                                       $outputPage->addWikiText( Html::errorBox( $errortext ) );
+                                                       $outputPage->addWikiTextAsInterface( Html::errorBox( $errortext ) );
                                                }
                                                # Connection or timeout error
                                                return;
@@@ -1461,7 -1461,7 +1461,7 @@@
  
                        $dir = $this->getContext()->getLanguage()->getDir();
                        $lang = $this->getContext()->getLanguage()->getHtmlCode();
-                       $outputPage->addWikiText( Xml::openElement( 'div', [
+                       $outputPage->addWikiTextAsInterface( Xml::openElement( 'div', [
                                'class' => "noarticletext mw-content-$dir",
                                'dir' => $dir,
                                'lang' => $lang,
@@@ -1735,8 -1735,7 +1735,8 @@@
        public function render() {
                $this->getContext()->getRequest()->response()->header( 'X-Robots-Tag: noindex' );
                $this->getContext()->getOutput()->setArticleBodyOnly( true );
 -              $this->disableSectionEditForRender = true;
 +              // We later set 'enableSectionEditLinks=false' based on this; also used by ImagePage
 +              $this->viewIsRenderAction = true;
                $this->view();
        }
  
@@@ -2088,7 -2087,7 +2088,7 @@@
                        );
  
                        if ( $error == '' ) {
-                               $outputPage->addWikiText(
+                               $outputPage->addWikiTextAsInterface(
                                        "<div class=\"error mw-error-cannotdelete\">\n" . $status->getWikiText() . "\n</div>"
                                );
                                $deleteLogPage = new LogPage( 'delete' );

diff --combined includes/page/ImagePage.php
index 1773e16,2489386..5d4f08e
--- 1/includes/page/ImagePage.php
--- 2/includes/page/ImagePage.php
+++ b/includes/page/ImagePage.php
@@@ -86,15 -86,18 +86,15 @@@ class ImagePage extends Article 
                $this->repo = $img->getRepo();
        }
  
 -      /**
 -       * Handler for action=render
 -       * Include body text only; none of the image extras
 -       */
 -      public function render() {
 -              $this->getContext()->getOutput()->setArticleBodyOnly( true );
 -              parent::view();
 -      }
 -
        public function view() {
                global $wgShowEXIF;
  
 +              // For action=render, include body text only; none of the image extras
 +              if ( $this->viewIsRenderAction ) {
 +                      parent::view();
 +                      return;
 +              }
 +
                $out = $this->getContext()->getOutput();
                $request = $this->getContext()->getRequest();
                $diff = $request->getVal( 'diff' );
@@@ -158,7 -161,7 +158,7 @@@
                if ( $this->mExtraDescription ) {
                        $fol = $this->getContext()->msg( 'shareddescriptionfollows' );
                        if ( !$fol->isDisabled() ) {
-                               $out->addWikiText( $fol->plain() );
+                               $out->addWikiTextAsInterface( $fol->plain() );
                        }
                        $out->addHTML( '<div id="shared-image-desc">' . $this->mExtraDescription . "</div>\n" );
                }
@@@ -187,7 -190,7 +187,7 @@@
                                'h2',
                                [ 'id' => 'metadata' ],
                                        $this->getContext()->msg( 'metadata' )->text() ) . "\n" );
-                       $out->addWikiText( $this->makeMetadataTable( $formattedMetadata ) );
+                       $out->addWikiTextAsInterface( $this->makeMetadataTable( $formattedMetadata ) );
                        $out->addModules( [ 'mediawiki.action.view.metadata' ] );
                }
  
@@@ -539,14 -542,14 +539,14 @@@
                                // to the filename, because it can get copied with it.
                                // See T27277.
                                // phpcs:disable Generic.Files.LineLength
-                               $out->addWikiText( <<<EOT
+                               $out->addWikiTextAsInterface( <<<EOT
  <div class="fullMedia"><span class="dangerousLink">{$medialink}</span> $dirmark<span class="fileInfo">$longDesc</span></div>
  <div class="mediaWarning">$warning</div>
  EOT
                                );
                                // phpcs:enable
                        } else {
-                               $out->addWikiText( <<<EOT
+                               $out->addWikiTextAsInterface( <<<EOT
  <div class="fullMedia">{$medialink} {$dirmark}<span class="fileInfo">$longDesc</span>
  </div>
  EOT
@@@ -571,7 -574,7 +571,7 @@@
                                        'file-no-thumb-animation'
                                )->plain();
  
-                               $out->addWikiText( <<<EOT
+                               $out->addWikiTextAsInterface( <<<EOT
  <div class="mw-noanimatethumb">{$noAnimMesg}</div>
  EOT
                                );
@@@ -1002,7 -1005,7 +1002,7 @@@
                $out->setRobotPolicy( 'noindex,nofollow' );
                $out->setArticleRelated( false );
                $out->enableClientCache( false );
-               $out->addWikiText( $description );
+               $out->addWikiTextAsInterface( $description );
        }
  
        /**