Merge "EditPage: Don't set 'hookaborted' error if the hook set a better error"

diff --combined includes/EditPage.php
index 541541a,2d53e01..6ae4371
--- 1/includes/EditPage.php
--- 2/includes/EditPage.php
+++ b/includes/EditPage.php
@@@ -689,6 -689,10 +689,6 @@@ class EditPage 
                # checking, etc.
                if ( $this->formtype == 'initial' || $this->firsttime ) {
                        if ( $this->initialiseForm() === false ) {
 -                              $out = $this->context->getOutput();
 -                              if ( $out->getRedirect() === '' ) { // mcrundo hack redirects, don't override it
 -                                      $this->noSuchSectionPage();
 -                              }
                                return;
                        }
  
@@@ -1127,7 -1131,7 +1127,7 @@@
         * @return string|null
         */
        protected function importContentFormData( &$request ) {
 -              return; // Don't do anything, EditPage already extracted wpTextbox1
 +              return null; // Don't do anything, EditPage already extracted wpTextbox1
        }
  
        /**
@@@ -1141,26 -1145,8 +1141,26 @@@
  
                $content = $this->getContentObject( false ); # TODO: track content object?!
                if ( $content === false ) {
 +                      $out = $this->context->getOutput();
 +                      if ( $out->getRedirect() === '' ) { // mcrundo hack redirects, don't override it
 +                              $this->noSuchSectionPage();
 +                      }
                        return false;
                }
 +
 +              if ( !$this->isSupportedContentModel( $content->getModel() ) ) {
 +                      $modelMsg = $this->getContext()->msg( 'content-model-' . $content->getModel() );
 +                      $modelName = $modelMsg->exists() ? $modelMsg->text() : $content->getModel();
 +
 +                      $out = $this->context->getOutput();
 +                      $out->showErrorPage(
 +                              'modeleditnotsupported-title',
 +                              'modeleditnotsupported-text',
 +                              $modelName
 +                      );
 +                      return false;
 +              }
 +
                $this->textbox1 = $this->toEditText( $content );
  
                $user = $this->context->getUser();
@@@ -1799,8 -1785,11 +1799,11 @@@
                } 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
+                       if ( !$status->getErrors() ) {
+                               // Provide a fallback error message if none was set
+                               $status->fatal( 'hookaborted' );
+                       }
                        $this->hookError = $this->formatStatusErrors( $status );
-                       $status->fatal( 'hookaborted' );
                        $status->value = self::AS_HOOK_ERROR_EXPECTED;
                        return false;
                }
@@@ -4166,7 -4155,7 +4169,7 @@@ ERROR
         *  - 'legacy-name' (optional): short name for backwards-compatibility
         * @param array $checked Array of checkbox name (matching the 'legacy-name') => bool,
         *   where bool indicates the checked status of the checkbox
 -       * @return array
 +       * @return array[]
         */
        public function getCheckboxesDefinition( $checked ) {
                $checkboxes = [];