From 01aadc64cbf42a05dce7ee23412b43d5b7fa4dcb Mon Sep 17 00:00:00 2001 From: Rotem Liss Date: Fri, 29 Aug 2008 10:25:24 +0000 Subject: [PATCH] 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. --- includes/specials/SpecialUpload.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php index 35a9208b66..d2a55f0333 100644 --- 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' ); -- 2.20.1