Merge "Move condition to not show form one level up"

diff --combined includes/EditPage.php
index ad308b1,7d1cf1d..f4c35e0
--- 1/includes/EditPage.php
--- 2/includes/EditPage.php
+++ b/includes/EditPage.php
@@@ -1044,6 -1044,7 +1044,6 @@@ class EditPage 
  
                // Allow extensions to modify form data
                Hooks::run( 'EditPage::importFormData', [ $this, $request ] );
 -
        }
  
        /**
@@@ -1645,7 -1646,7 +1645,7 @@@
                                // being set. This is used by ConfirmEdit to display a captcha
                                // without any error message cruft.
                        } else {
 -                              $this->hookError = $this->formatStatusErrors( $status );
 +                              $this->hookError = $status->getWikiText();
                        }
                        // Use the existing $status->value if the hook set it
                        if ( !$status->value ) {
@@@ -1655,7 -1656,7 +1655,7 @@@
                } elseif ( !$status->isOK() ) {
                        # ...or the hook could be expecting us to produce an error
                        // FIXME this sucks, we should just use the Status object throughout
 -                      $this->hookError = $this->formatStatusErrors( $status );
 +                      $this->hookError = $status->getWikiText();
                        $status->fatal( 'hookaborted' );
                        $status->value = self::AS_HOOK_ERROR_EXPECTED;
                        return false;
@@@ -1664,6 -1665,26 +1664,6 @@@
                return true;
        }
  
 -      /**
 -       * Wrap status errors in an errorbox for increased visiblity
 -       *
 -       * @param Status $status
 -       * @return string
 -       */
 -      private function formatStatusErrors( Status $status ) {
 -              $errmsg = $status->getHTML(
 -                      'edit-error-short',
 -                      'edit-error-long',
 -                      $this->context->getLanguage()
 -              );
 -              return <<<ERROR
 -<div class="errorbox">
 -{$errmsg}
 -</div>
 -<br clear="all" />
 -ERROR;
 -      }
 -
        /**
         * Return the summary to be used for a new section.
         *
@@@ -2236,6 -2257,7 +2236,6 @@@
         * @return bool
         */
        private function mergeChangesIntoContent( &$editContent ) {
 -
                $db = wfGetDB( DB_MASTER );
  
                // This is the revision the editor started from
@@@ -2598,10 -2620,21 +2598,21 @@@
  
                $this->setHeaders();
  
-               if ( $this->showHeader() === false ) {
+               $this->addTalkPageText();
+               $this->addEditNotices();
+ 
+               if ( !$this->isConflict &&
+                       $this->section != '' &&
+                       !$this->isSectionEditSupported() ) {
+                       // We use $this->section to much before this and getVal('wgSection') directly in other places
+                       // at this point we can't reset $this->section to '' to fallback to non-section editing.
+                       // Someone is welcome to try refactoring though
+                       $wgOut->showErrorPage( 'sectioneditnotsupported-title', 'sectioneditnotsupported-text' );
                        return;
                }
  
+               $this->showHeader();
+ 
                $wgOut->addHTML( $this->editFormPageTop );
  
                if ( $wgUser->getOption( 'previewontop' ) ) {
@@@ -2811,6 -2844,7 +2822,6 @@@
                if ( !$wgUser->getOption( 'previewontop' ) ) {
                        $this->displayPreviewArea( $previewOutput, false );
                }
 -
        }
  
        /**
@@@ -2836,6 -2870,7 +2847,6 @@@
                return Html::rawElement( 'div', [ 'class' => 'templatesUsed' ],
                        $templateListFormatter->format( $templates, $type )
                );
 -
        }
  
        /**
@@@ -2854,29 -2889,14 +2865,14 @@@
                }
        }
  
-       /**
-        * @return bool
-        */
        protected function showHeader() {
                global $wgOut, $wgUser, $wgMaxArticleSize, $wgLang;
                global $wgAllowUserCss, $wgAllowUserJs;
  
-               $this->addTalkPageText();
- 
-               $this->addEditNotices();
- 
                if ( $this->isConflict ) {
                        $wgOut->wrapWikiMsg( "<div class='mw-explainconflict'>\n$1\n</div>", 'explainconflict' );
                        $this->editRevId = $this->page->getLatest();
                } else {
-                       if ( $this->section != '' && !$this->isSectionEditSupported() ) {
-                               // We use $this->section to much before this and getVal('wgSection') directly in other places
-                               // at this point we can't reset $this->section to '' to fallback to non-section editing.
-                               // Someone is welcome to try refactoring though
-                               $wgOut->showErrorPage( 'sectioneditnotsupported-title', 'sectioneditnotsupported-text' );
-                               return false;
-                       }
- 
                        if ( $this->section != '' && $this->section != 'new' ) {
                                if ( !$this->summary && !$this->preview && !$this->diff ) {
                                        $sectionTitle = self::extractSectionTitle( $this->textbox1 ); // FIXME: use Content object
@@@ -3063,8 -3083,6 +3059,6 @@@
                }
                # Add header copyright warning
                $this->showHeaderCopyrightWarning();
- 
-               return true;
        }
  
        /**
@@@ -3550,16 -3568,22 +3544,16 @@@ HTM
                ] ) .
                        Html::openElement( 'tbody' );
  
 -              foreach ( $output->getLimitReportData()['limitreport'] as $key => $value ) {
 +              foreach ( $output->getLimitReportData() as $key => $value ) {
                        if ( Hooks::run( 'ParserLimitReportFormat',
                                [ $key, &$value, &$limitReport, true, true ]
                        ) ) {
 -                              $keyMsg = wfMessage( "limitreport-$key" );
 -                              $valueMsg = wfMessage(
 -                                      [ "limitreport-$key-value-html", "limitreport-$key-value" ]
 -                              );
 +                              $keyMsg = wfMessage( $key );
 +                              $valueMsg = wfMessage( [ "$key-value-html", "$key-value" ] );
                                if ( !$valueMsg->exists() ) {
                                        $valueMsg = new RawMessage( '$1' );
                                }
                                if ( !$keyMsg->isDisabled() && !$valueMsg->isDisabled() ) {
 -                                      // If it's a value/limit array, convert it for $1/$2
 -                                      if ( is_array( $value ) && isset( $value['value'] ) ) {
 -                                              $value = [ $value['value'], $value['limit'] ];
 -                                      }
                                        $limitReport .= Html::openElement( 'tr' ) .
                                                Html::rawElement( 'th', null, $keyMsg->parse() ) .
                                                Html::rawElement( 'td', null, $valueMsg->params( $value )->parse() ) .
@@@ -4391,9 -4415,6 +4385,9 @@@
                return strtr( $result, [ "&#x0" => "&#x" ] );
        }
  
 +      /**
 +       * @since 1.29
 +       */
        protected function addEditNotices() {
                global $wgOut;
  
@@@ -4412,9 -4433,6 +4406,9 @@@
                }
        }
  
 +      /**
 +       * @since 1.29
 +       */
        protected function addTalkPageText() {
                global $wgOut;