replace TYPE= with ENGINE=, (supported since 4.0, TYPE deprecated since 4.1)

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

diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php
index 70920a7..8bdfd8e 100644 (file)
--- a/includes/SpecialUpload.php
+++ b/includes/SpecialUpload.php
@@ -114,7 +114,7 @@ class UploadForm {
                } else {
                        $wgOut->errorPage( 'uploadnologin', 'uploadnologintext' );
                        return;
-               }       
+               }
 
                # Check blocks
                if( $wgUser->isBlocked() ) {
@@ -153,7 +153,7 @@ class UploadForm {
         * @access private
         */
        function processUpload() {
-               global $wgUser, $wgOut, $wgUploadDirectory;
+               global $wgUser, $wgOut;
 
                /* Check for PHP error if any, requires php 4.2 or newer */
                if ( $this->mUploadError == 1/*UPLOAD_ERR_INI_SIZE*/ ) {
@@ -344,7 +344,7 @@ class UploadForm {
         *                        is a PHP-managed upload temporary
         */
        function saveUploadedFile( $saveName, $tempName, $useRename = false ) {
-               global $wgUploadDirectory, $wgOut;
+               global $wgOut;
 
                $fname= "SpecialUpload::saveUploadedFile";
 
@@ -493,7 +493,7 @@ class UploadForm {
         * @access private
         */
        function uploadWarning( $warning ) {
-               global $wgOut, $wgUser, $wgUploadDirectory, $wgRequest;
+               global $wgOut;
                global $wgUseCopyrightUpload;
 
                $this->mSessionKey = $this->stashSession();
@@ -557,7 +557,7 @@ class UploadForm {
         * @access private
         */
        function mainUploadForm( $msg='' ) {
-               global $wgOut, $wgUser, $wgUploadDirectory, $wgRequest;
+               global $wgOut, $wgUser;
                global $wgUseCopyrightUpload;
 
                $cols = intval($wgUser->getOption( 'cols' ));
@@ -920,7 +920,7 @@ class UploadForm {
        *         If textual feedback is missing but a virus was found, this function returns true.
        */
        function detectVirus($file) {
-               global $wgAntivirus, $wgAntivirusSetup, $wgAntivirusRequired;
+               global $wgAntivirus, $wgAntivirusSetup, $wgAntivirusRequired, $wgOut;
 
                $fname= "SpecialUpload::detectVirus";