Per comment at r50961: keep the messages saying "you need to be logged in to ......

diff --git a/includes/Title.php b/includes/Title.php
index 74cd6f0..baea55e 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1171,7 +1171,14 @@ class Title {
                        
                        if( !$user->isAllowed( 'move' ) ) {
                                // User can't move anything
-                               $errors[] = array ('movenotallowed');
+                               global $wgGroupPermissions;
+                               if( $user->isAnon() && ( $wgGroupPermissions['user']['move']
+                               || $wgGroupPermissions['autoconfirmed']['move'] ) ) {
+                                       // custom message if logged-in users without any special rights can move
+                                       $errors[] = array ( 'movenologintext' );
+                               } else {
+                                       $errors[] = array ('movenotallowed');
+                               }
                        }
                } elseif ( $action == 'create' ) {
                        if( ( $this->isTalkPage() && !$user->isAllowed( 'createtalk' ) ) ||

diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index ad8366b..fcd19ce 100644 (file)
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -244,8 +244,15 @@ class UploadForm {
                }
 
                # Check permissions
+               global $wgGroupPermissions;
                if( !$wgUser->isAllowed( 'upload' ) ) {
-                       $wgOut->permissionRequired( 'upload' );
+                       if( !$wgUser->isLoggedIn() && ( $wgGroupPermissions['user']['upload']
+                               || $wgGroupPermissions['autoconfirmed']['upload'] ) ) {
+                               // Custom message if logged-in users without any special rights can upload
+                               $wgOut->showErrorPage( 'uploadnologin', 'uploadnologintext' );
+                       } else {
+                               $wgOut->permissionRequired( 'upload' );
+                       }
                        return;
                }
 

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index ecf49f4..7c47c0f 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1820,6 +1820,8 @@ Pages on [[Special:Watchlist|your watchlist]] are '''bold'''.",
 'uploadbtn'                   => 'Upload file',
 'reupload'                    => 'Re-upload',
 'reuploaddesc'                => 'Cancel upload and return to the upload form',
+'uploadnologin'               => 'Not logged in',
+'uploadnologintext'           => 'You must be [[Special:UserLogin|logged in]] to upload files.',
 'upload_directory_missing'    => 'The upload directory ($1) is missing and could not be created by the webserver.',
 'upload_directory_read_only'  => 'The upload directory ($1) is not writable by the webserver.',
 'uploaderror'                 => 'Upload error',
@@ -2773,6 +2775,8 @@ please be sure you understand the consequences of this before proceeding.",
 
 In those cases, you will have to move or merge the page manually if desired.",
 'movearticle'                  => 'Move page:',
+'movenologin'                  => 'Not logged in',
+'movenologintext'              => 'You must be a registered user and [[Special:UserLogin|logged in]] to move a page.',
 'movenotallowed'               => 'You do not have permission to move pages.',
 'movenotallowedfile'           => 'You do not have permission to move files.',
 'cant-move-user-page'          => 'You do not have permission to move user pages (apart from subpages).',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 22a366f..438ef5a 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -1130,6 +1130,8 @@ $wgMessageStructure = array(
                'uploadbtn',
                'reupload',
                'reuploaddesc',
+        'uploadnologin',
+        'uploadnologintext',
                'upload_directory_missing',
                'upload_directory_read_only',
                'uploaderror',
@@ -1922,6 +1924,8 @@ $wgMessageStructure = array(
                'movepagetext',
                'movepagetalktext',
                'movearticle',
+               'movenologin',
+               'movenologintext',
                'movenotallowed',
                'movenotallowedfile',
                'cant-move-user-page',