Fixing a fatal error on upload page:

Fatal error: Call to a member function isAllowed() on a non-object in /home/rotemliss/Server/wiki/source/trunk/phase3/includes/specials/SpecialUpload.php on line 125

The old code (introduced in r40190) used a $this->mUpload object, which does not exist on GET requests to Special:Upload. The new code uses direct User::isAllowed check in such cases.

diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index 35a9208..d2a55f0 100644 (file)
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -122,7 +122,11 @@ class UploadForm {
                }
 
                # Check permissions
-               $permission = $this->mUpload->isAllowed( $wgUser );
+               if( $this->mUpload ) {
+                       $permission = $this->mUpload->isAllowed( $wgUser );
+               } else {
+                       $permission = $wgUser->isAllowed( 'upload' ) ? true : 'upload';
+               }
                if( $permission !== true ) {
                        if( !$wgUser->isLoggedIn() ) {
                                $wgOut->showErrorPage( 'uploadnologin', 'uploadnologintext' );