* (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 ==
*/
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;