Merge "Make User::isBot() also check the "bot" right for sanity"

diff --combined includes/user/User.php
index b1c270f,b62d252..b5384bc
--- 1/includes/user/User.php
--- 2/includes/user/User.php
+++ b/includes/user/User.php
@@@ -127,7 -127,6 +127,7 @@@ class User implements IDBAccessObject 
                'createpage',
                'createtalk',
                'delete',
 +              'deletechangetags',
                'deletedhistory',
                'deletedtext',
                'deletelogentry',
@@@ -3404,12 -3403,14 +3404,14 @@@
         * @since 1.28
         */
        public function isBot() {
-               $isBot = false;
-               if ( !Hooks::run( "UserIsBot", [ $this, &$isBot ] ) ) {
-                       return $isBot;
+               if ( in_array( 'bot', $this->getGroups() ) && $this->isAllowed( 'bot' ) ) {
+                       return true;
                }
  
-               return ( $isBot || in_array( 'bot', $this->getGroups() ) );
+               $isBot = false;
+               Hooks::run( "UserIsBot", [ $this, &$isBot ] );
+ 
+               return $isBot;
        }
  
        /**