From: Fomafix <fomafix@googlemail.com>
Date: Sat, 28 May 2016 20:21:07 +0000 (+0000)
Subject: EditPage: Do not resolve redirect on cancel button
X-Git-Tag: 1.31.0-rc.0~6769^2
X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_del%27%2C%20idvote=vote.voteid%29%20%7D%7D?a=commitdiff_plain;h=9871bca6dff5bec3859a3c9b00631567d87e1ffa;hp=85f07327af5f63be616ac5d0213c80f5e5828b5c;p=lhc%2Fweb%2Fwiklou.git

EditPage: Do not resolve redirect on cancel button

Change-Id: I9343c7e97cee7fa6550b186e6a6ffbf3438060a4
---

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 8acd036039..f2403fe222 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -3501,6 +3501,8 @@ HTML
 		$cancelParams = [];
 		if ( !$this->isConflict && $this->oldid > 0 ) {
 			$cancelParams['oldid'] = $this->oldid;
+		} elseif ( $this->getContextTitle()->isRedirect() ) {
+			$cancelParams['redirect'] = 'no';
 		}
 		$attrs = [ 'id' => 'mw-editform-cancel' ];