diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2009-06-10 13:00:47 +0200 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2009-06-10 13:00:47 +0200 |
| commit | 72e90545454c0e014318fa3c81658e035aac58c1 (patch) | |
| tree | 9212e3f46868989c4d57ae9a5c8a1a80e4dc0702 /includes/FileDeleteForm.php | |
| parent | 565a0ccc371ec1a2a0e9b39487cbac18e6f60e25 (diff) | |
applying patch to version 1.15.0
Diffstat (limited to 'includes/FileDeleteForm.php')
| -rw-r--r-- | includes/FileDeleteForm.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php index 66086b0f..5177d35f 100644 --- a/includes/FileDeleteForm.php +++ b/includes/FileDeleteForm.php @@ -67,7 +67,7 @@ class FileDeleteForm { $reason = $this->DeleteReasonList; if ( $reason != 'other' && $this->DeleteReason != '') { // Entry from drop down menu + additional comment - $reason .= ': ' . $this->DeleteReason; + $reason .= wfMsgForContent( 'colon-separator' ) . $this->DeleteReason; } elseif ( $reason == 'other' ) { $reason = $this->DeleteReason; } @@ -108,7 +108,8 @@ class FileDeleteForm { $id = $title->getArticleID( GAID_FOR_UPDATE ); // Need to delete the associated article $article = new Article( $title ); - if( wfRunHooks('ArticleDelete', array(&$article, &$wgUser, &$reason)) ) { + $error = ''; + if( wfRunHooks('ArticleDelete', array(&$article, &$wgUser, &$reason, &$error)) ) { if( $article->doDeleteArticle( $reason, $suppress, $id ) ) { global $wgRequest; if( $wgRequest->getCheck( 'wpWatch' ) ) { |