Merge "EditPage: Allow summary=0 in URL parameter"

diff --combined includes/EditPage.php
index e087a6e,2491cb1..670b93d
--- 1/includes/EditPage.php
--- 2/includes/EditPage.php
+++ b/includes/EditPage.php
@@@ -684,10 -684,7 +684,10 @@@ class EditPage 
                # checking, etc.
                if ( 'initial' == $this->formtype || $this->firsttime ) {
                        if ( $this->initialiseForm() === false ) {
 -                              $this->noSuchSectionPage();
 +                              $out = $this->context->getOutput();
 +                              if ( $out->getRedirect() === '' ) { // mcrundo hack redirects, don't override it
 +                                      $this->noSuchSectionPage();
 +                              }
                                return;
                        }
  
@@@ -1058,7 -1055,7 +1058,7 @@@
                                $this->sectiontitle = $request->getVal( 'preloadtitle' );
                                // Once wpSummary isn't being use for setting section titles, we should delete this.
                                $this->summary = $request->getVal( 'preloadtitle' );
-                       } elseif ( $this->section != 'new' && $request->getVal( 'summary' ) ) {
+                       } elseif ( $this->section != 'new' && $request->getVal( 'summary' ) !== '' ) {
                                $this->summary = $request->getText( 'summary' );
                                if ( $this->summary !== '' ) {
                                        $this->hasPresetSummary = true;
@@@ -1223,13 -1220,8 +1223,13 @@@
                                                !$oldrev->isDeleted( Revision::DELETED_TEXT )
                                        ) {
                                                if ( WikiPage::hasDifferencesOutsideMainSlot( $undorev, $oldrev ) ) {
 -                                                      // Cannot yet undo edits that involve anything other the main slot.
 -                                                      $undoMsg = 'main-slot-only';
 +                                                      // Hack for undo while EditPage can't handle multi-slot editing
 +                                                      $this->context->getOutput()->redirect( $this->mTitle->getFullURL( [
 +                                                              'action' => 'mcrundo',
 +                                                              'undo' => $undo,
 +                                                              'undoafter' => $undoafter,
 +                                                      ] ) );
 +                                                      return false;
                                                } else {
                                                        $content = $this->page->getUndoContent( $undorev, $oldrev );
  
@@@ -2869,7 -2861,7 +2869,7 @@@ ERROR
                        $this->autoSumm = md5( '' );
                }
  
-               $autosumm = $this->autoSumm ?: md5( $this->summary );
+               $autosumm = $this->autoSumm !== '' ? $this->autoSumm : md5( $this->summary );
                $out->addHTML( Html::hidden( 'wpAutoSummary', $autosumm ) );
  
                $out->addHTML( Html::hidden( 'oldid', $this->oldid ) );