Tell regexp parser to use extra analysis on external link regexp;

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

diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php
index 5da613b..1e3d40c 100644 (file)
--- a/includes/SpecialUpload.php
+++ b/includes/SpecialUpload.php
@@ -178,7 +178,7 @@ class UploadForm {
                if( is_null( $nt ) ) {
                        return $this->uploadError( wfMsg( 'illegalfilename', htmlspecialchars( $filtered ) ) );
                }
-               $nt->setNamespace( NS_IMAGE );
+               $nt =& Title::makeTitle( NS_IMAGE, $nt->getDBkey() );
                $this->mUploadSaveName = $nt->getDBkey();
                
                /**
@@ -403,7 +403,7 @@ class UploadForm {
                global $wgOut;
                $sub = wfMsg( 'uploadwarning' );
                $wgOut->addHTML( "<h2>{$sub}</h2>\n" );
-               $wgOut->addHTML( "<h4 style='error'>{$error}</h4>\n" );
+               $wgOut->addHTML( "<h4 class='error'>{$error}</h4>\n" );
        }
 
        /**
@@ -451,6 +451,7 @@ class UploadForm {
        <input type=hidden name=\"wpUploadAffirm\" value=\"1\" />
        <input type=hidden name=\"wpIgnoreWarning\" value=\"1\" />
        <input type=hidden name=\"wpSessionKey\" value=\"" . htmlspecialchars( $this->mSessionKey ) . "\" />
+       <input type=hidden name=\"wpUploadDescription\" value=\"" . htmlspecialchars( $this->mUploadDescription ) . "\" />
        {$copyright}
        <table border='0'><tr>
        <tr><td align='right'>
@@ -475,7 +476,7 @@ class UploadForm {
                if ( '' != $msg ) {
                        $sub = wfMsg( 'uploaderror' );
                        $wgOut->addHTML( "<h2>{$sub}</h2>\n" .
-                         "<h4 style='error'>{$msg}</h4>\n" );
+                         "<h4 class='error'>{$msg}</h4>\n" );
                } else {
                        $sub = wfMsg( 'uploadfile' );
                        $wgOut->addHTML( "<h2>{$sub}</h2>\n" );