EditPage: Do not resolve redirect on cancel button

Change-Id: I9343c7e97cee7fa6550b186e6a6ffbf3438060a4

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 8acd036..f2403fe 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -3501,6 +3501,8 @@ HTML
                $cancelParams = [];
                if ( !$this->isConflict && $this->oldid > 0 ) {
                        $cancelParams['oldid'] = $this->oldid;
                $cancelParams = [];
                if ( !$this->isConflict && $this->oldid > 0 ) {
                        $cancelParams['oldid'] = $this->oldid;

+               } elseif ( $this->getContextTitle()->isRedirect() ) {
+                       $cancelParams['redirect'] = 'no';

                }
                $attrs = [ 'id' => 'mw-editform-cancel' ];
 
                }
                $attrs = [ 'id' => 'mw-editform-cancel' ];