re: r65152 fix translatewiki problems

* Recover lost $permErrorsUpload in uploadBase::verifyPermissions
* Use Http::isValidURI() to replace UploadFromUrl::isvalidurl()

diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index ea40288..bf88de5 100644 (file)
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -385,6 +385,7 @@ abstract class UploadBase {
                        return true;
                }
                $permErrors = $nt->getUserPermissionsErrors( 'edit', $user );
+               $permErrorsUpload = $nt->getUserPermissionsErrors( 'upload', $user );
                $permErrorsCreate = ( $nt->exists() ? array() : $nt->getUserPermissionsErrors( 'create', $user ) );
                if( $permErrors || $permErrorsUpload || $permErrorsCreate ) {
                        $permErrors = array_merge( $permErrors, wfArrayDiff2( $permErrorsUpload, $permErrors ) );

diff --git a/includes/upload/UploadFromUrl.php b/includes/upload/UploadFromUrl.php
index a904cf2..8f851b0 100644 (file)
--- a/includes/upload/UploadFromUrl.php
+++ b/includes/upload/UploadFromUrl.php
@@ -104,7 +104,7 @@ class UploadFromUrl extends UploadBase {
                if( !$request->getVal( 'wpUploadFileURL' ) )
                        return false;
                // check that is a valid url:
-               return self::isValidUrl( $request->getVal( 'wpUploadFileURL' ) );
+               return Http::isValidURI( $request->getVal( 'wpUploadFileURL' ) );
        }
 
        private function saveTempFile( $req ) {