Removing variableSubstitution broke passing magic variables as template

[lhc/web/wiklou.git] / includes / SpecialUpload.php

diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php
index 737c619..6bf243c 100644 (file)
--- a/includes/SpecialUpload.php
+++ b/includes/SpecialUpload.php
@@ -25,10 +25,14 @@ function wfSpecialUpload() {
  * @subpackage SpecialPage
  */
 class UploadForm {
+       /**#@+
+        * @access private
+        */
        var $mUploadAffirm, $mUploadFile, $mUploadDescription, $mIgnoreWarning;
        var $mUploadSaveName, $mUploadTempName, $mUploadSize, $mUploadOldVersion;
        var $mUploadCopyStatus, $mUploadSource, $mReUpload, $mAction, $mUpload;
        var $mOname, $mSessionKey;
+       /**#@- */
 
        /**
         * Constructor : initialise object
@@ -112,6 +116,8 @@ class UploadForm {
                global $wgCheckFileExtensions, $wgStrictFileExtensions;
                global $wgFileExtensions, $wgFileBlacklist, $wgUploadSizeWarning;
 
+               /** When using detailed copyright, if user filled field, assume he
+                * confirmed the upload */
                if ( $wgUseCopyrightUpload ) {
                        $this->mUploadAffirm = 1;
                        if ($wgCheckCopyrightUpload && 
@@ -120,12 +126,13 @@ class UploadForm {
                        }
                }
 
+               /** User need to confirm his upload */
                if ( $this->mUploadAffirm != 1) {
                        $this->mainUploadForm( WfMsg( 'noaffirmation' ) );
                        return;
                }
 
-               if ( '' != $this->mOname ) {
+               if ( $this->mOname != '' ) {
                        $basename = strrchr( $this->mOname, '/' );
 
                        if ( false === $basename ) { $basename = $this->mOname; }
@@ -152,7 +159,6 @@ class UploadForm {
                                $basename = $bn;
                        }
 
-
                        $nt = Title::newFromText( $basename );
                        if( !$nt ) {
                                return $this->uploadError( wfMsg( 'illegalfilename', htmlspecialchars( $basename ) ) );
@@ -190,12 +196,16 @@ class UploadForm {
                                }
                                if( $nt->getArticleID() ) {
                                        $sk = $wgUser->getSkin();
-                                       $dname = $wgLang->getNsText( Namespace::getImage() ) . ":{$this->mUploadSaveName}";
+                                       $dname = $wgLang->getNsText( Namespace::getImage() ) .':'.$this->mUploadSaveName;
                                        $dlink = $sk->makeKnownLink( $dname, $dname );
                                        $warning .= '<li>'.wfMsg( 'fileexists', $dlink ).'</li>';
                                }
                                if($warning != '') return $this->uploadWarning($warning);
                        }
+               } elseif(!isset($this->mUploadSaveName)) {
+                       // no filename given even when reuploading
+                       return $this->uploadError('<li>'.wfMsg( 'emptyfile' ).'</li>');
+               
                }
                if ( !is_null( $this->mUploadOldVersion ) ) {
                        $wgUploadOldVersion = $this->mUploadOldVersion;
@@ -205,12 +215,12 @@ class UploadForm {
 
                $sk = $wgUser->getSkin();
                $ilink = $sk->makeMediaLink( $this->mUploadSaveName, Image::wfImageUrl( $this->mUploadSaveName ) );
-               $dname = $wgLang->getNsText( Namespace::getImage() ) . ":{$this->mUploadSaveName}";
+               $dname = $wgLang->getNsText( Namespace::getImage() ) . ':'.$this->mUploadSaveName;
                $dlink = $sk->makeKnownLink( $dname, $dname );
 
                $wgOut->addHTML( '<h2>' . wfMsg( 'successfulupload' ) . "</h2>\n" );
                $text = wfMsg( 'fileuploaded', $ilink, $dlink );
-               $wgOut->addHTML( "<p>{$text}\n" );
+               $wgOut->addHTML( '<p>'.$text."\n" );
                $wgOut->returnToMain( false );
        }