From: Daniel Cannon <amidaniel@users.mediawiki.org>
Date: Mon, 3 Dec 2007 00:14:36 +0000 (+0000)
Subject: * (bug 12178) Fix wpReason parameter to action=delete, again.
X-Git-Tag: 1.31.0-rc.0~50604
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=commitdiff_plain;h=ee60c3d2435b65b679447092da66590d147469f4;p=lhc%2Fweb%2Fwiklou.git

* (bug 12178) Fix wpReason parameter to action=delete, again.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 400d11ea47..0896f4980f 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -206,6 +206,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 451) Add a generic Traditional / Simplified Chinese conversion table, 
   instead of a Traditional conversion with Taiwan variant, and a Simplified 
   conversion with China variant.
+* (bug 12178) Fix wpReason parameter to action=delete, again.
 
 == Parser changes in 1.12 ==
 
diff --git a/includes/Article.php b/includes/Article.php
index 86014de51c..85416c6f04 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1923,11 +1923,15 @@ class Article {
 	 */
 	function delete() {
 		global $wgUser, $wgOut, $wgRequest;
+
 		$confirm = $wgRequest->wasPosted() &&
-			$wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) );
-		$this->DeleteReasonList = $wgRequest->getText( 'wpDeleteReasonList' );
+				$wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) );
+		
+		$this->DeleteReasonList = $wgRequest->getText( 'wpDeleteReasonList', 'other' );
 		$this->DeleteReason = $wgRequest->getText( 'wpReason' );
+		
 		$reason = $this->DeleteReasonList;
+		
 		if ( $reason != 'other' && $this->DeleteReason != '') {
 			// Entry from drop down menu + additional comment
 			$reason .= ': ' . $this->DeleteReason;