From: Daniel Cannon <amidaniel@users.mediawiki.org>
Date: Mon, 19 Nov 2007 03:59:45 +0000 (+0000)
Subject: * Fixed wgReason URL parameter to action=delete.
X-Git-Tag: 1.31.0-rc.0~50815
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=1d1104955a802bf56c699174de0b891b30de1679;p=lhc%2Fweb%2Fwiklou.git

* Fixed wgReason URL parameter to action=delete.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index bdf4a83191..27a4e0eccf 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -163,6 +163,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   the page
 * Check for if IP is blocked as part of a range when unblocking (see above bug-
   fix) was faulty. Now fixed.
+* Fixed wgReason URL parameter to action=delete.
 
 === API changes in 1.12 ===
 
diff --git a/includes/Article.php b/includes/Article.php
index 75ac533b6e..e4fcc33d9a 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1960,7 +1960,7 @@ class Article {
 
 		// Generate deletion reason
 		$hasHistory = false;
-		$reason = $this->generateReason($hasHistory);
+		if ( !$reason ) $reason = $this->generateReason($hasHistory);
 
 		// If the page has a history, insert a warning
 		if( $hasHistory && !$confirm ) {