From 4e93755526813a6510f632a5fc25de28a0ff52f0 Mon Sep 17 00:00:00 2001 From: Michael Dale Date: Fri, 17 Jul 2009 21:52:06 +0000 Subject: [PATCH] a few more minor fixes of things lost in the SpecialUpload.php r53282 merge --- includes/specials/SpecialUpload.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php index b8cf2a76db..0cd6d1bc1c 100644 --- a/includes/specials/SpecialUpload.php +++ b/includes/specials/SpecialUpload.php @@ -296,6 +296,8 @@ class UploadForm extends SpecialPage { if( !$this->mForReUpload ) { $pageText = self::getInitialPageText( $this->mComment, $this->mLicense, $this->mCopyrightStatus, $this->mCopyrightSource ); + } else { + $pageText = false; } $status = $this->mUpload->performUpload( $this->mComment, $pageText, $this->mWatchthis, $wgUser ); @@ -1063,13 +1065,13 @@ wgUploadAutoFill = {$autofill}; if ( $license != '' ) { $licensetxt = '== ' . wfMsgForContent( 'license' ) . " ==\n" . '{{' . $license . '}}' . "\n"; } - $pageText = '== ' . wfMsg ( 'filedesc' ) . " ==\n" . $comment . "\n" . + $pageText = '== ' . wfMsgForContent ( 'filedesc' ) . " ==\n" . $comment . "\n" . '== ' . wfMsgForContent ( 'filestatus' ) . " ==\n" . $copyStatus . "\n" . "$licensetxt" . '== ' . wfMsgForContent ( 'filesource' ) . " ==\n" . $source ; } else { if ( $license != '' ) { - $filedesc = $comment == '' ? '' : '== ' . wfMsg ( 'filedesc' ) . " ==\n" . $comment . "\n"; + $filedesc = $comment == '' ? '' : '== ' . wfMsgForContent ( 'filedesc' ) . " ==\n" . $comment . "\n"; $pageText = $filedesc . '== ' . wfMsgForContent ( 'license' ) . " ==\n" . '{{' . $license . '}}' . "\n"; } else { -- 2.20.1