Merge "Revert "mediawiki.Upload.BookletLayout: If the user can't upload, don't show...

diff --git a/resources/Resources.php b/resources/Resources.php
index 3a6a3b5..59ce155 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1171,7 +1171,6 @@ return array(
                ),
                'dependencies' => array(
                        'oojs-ui',
-                       'mediawiki.user',
                        'mediawiki.Upload',
                        'mediawiki.jqueryMsg',
                ),

diff --git a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
index 0a1121b..dd199ce 100644 (file)
--- a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
+++ b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
@@ -88,17 +88,6 @@
                                content: [ this.insertForm ]
                        } )
                ] );
-
-               // If the user can't upload anything, don't give them the option to
-               // TODO Check the rights on the target wiki rather than current, they might not be the same
-               mw.user.getRights().done( function ( rights ) {
-                       if ( rights.indexOf( 'upload' ) === -1 ) {
-                               this.getPage( 'upload' ).$element
-                                       .empty()
-                                       // TODO Use a better error message when not all logged-in users can upload
-                                       .msg( 'api-error-mustbeloggedin' );
-                       }
-               }.bind( this ) );
        };
 
        /* Setup */