a few more minor fixes of things lost in the SpecialUpload.php r53282 merge

diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index b8cf2a7..0cd6d1b 100644 (file)
--- 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 {