Merge "@since for User::newSystemUser"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 14 May 2016 08:24:00 +0000 (08:24 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 14 May 2016 08:24:00 +0000 (08:24 +0000)
1  2 
includes/user/User.php

diff --combined includes/user/User.php
@@@ -127,7 -127,6 +127,7 @@@ class User implements IDBAccessObject 
                'createpage',
                'createtalk',
                'delete',
 +              'deletechangetags',
                'deletedhistory',
                'deletedtext',
                'deletelogentry',
         *  - steal: Whether to reset the account's password and email if it
         *    already exists, default false
         * @return User|null
+        * @since 1.27
         */
        public static function newSystemUser( $name, $options = [] ) {
                $options += [
         * @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;
        }
  
        /**