| Index: trunk/phase3/includes/specials/SpecialUpload.php |
| — | — | @@ -296,6 +296,8 @@ |
| 297 | 297 | if( !$this->mForReUpload ) { |
| 298 | 298 | $pageText = self::getInitialPageText( $this->mComment, $this->mLicense, |
| 299 | 299 | $this->mCopyrightStatus, $this->mCopyrightSource ); |
| | 300 | + } else { |
| | 301 | + $pageText = false; |
| 300 | 302 | } |
| 301 | 303 | $status = $this->mUpload->performUpload( $this->mComment, $pageText, $this->mWatchthis, $wgUser ); |
| 302 | 304 | |
| — | — | @@ -1063,13 +1065,13 @@ |
| 1064 | 1066 | if ( $license != '' ) { |
| 1065 | 1067 | $licensetxt = '== ' . wfMsgForContent( 'license' ) . " ==\n" . '{{' . $license . '}}' . "\n"; |
| 1066 | 1068 | } |
| 1067 | | - $pageText = '== ' . wfMsg ( 'filedesc' ) . " ==\n" . $comment . "\n" . |
| | 1069 | + $pageText = '== ' . wfMsgForContent ( 'filedesc' ) . " ==\n" . $comment . "\n" . |
| 1068 | 1070 | '== ' . wfMsgForContent ( 'filestatus' ) . " ==\n" . $copyStatus . "\n" . |
| 1069 | 1071 | "$licensetxt" . |
| 1070 | 1072 | '== ' . wfMsgForContent ( 'filesource' ) . " ==\n" . $source ; |
| 1071 | 1073 | } else { |
| 1072 | 1074 | if ( $license != '' ) { |
| 1073 | | - $filedesc = $comment == '' ? '' : '== ' . wfMsg ( 'filedesc' ) . " ==\n" . $comment . "\n"; |
| | 1075 | + $filedesc = $comment == '' ? '' : '== ' . wfMsgForContent ( 'filedesc' ) . " ==\n" . $comment . "\n"; |
| 1074 | 1076 | $pageText = $filedesc . |
| 1075 | 1077 | '== ' . wfMsgForContent ( 'license' ) . " ==\n" . '{{' . $license . '}}' . "\n"; |
| 1076 | 1078 | } else { |