From 4ac9fa081a7c045f6a9f1cfc529d82423f485b2e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 8 Dec 2013 09:55:49 +0100
Subject: Update to MediaWiki 1.22.0

---
 maintenance/createAndPromote.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'maintenance/createAndPromote.php')

diff --git a/maintenance/createAndPromote.php b/maintenance/createAndPromote.php
index 81fbbb3d..aa25ee60 100644
--- a/maintenance/createAndPromote.php
+++ b/maintenance/createAndPromote.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Creates an account and grant it administrator rights.
+ * Creates an account and grants it rights.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,26 +23,26 @@
  * @author Pablo Castellano <pablo@anche.no>
  */
 
-require_once( __DIR__ . '/Maintenance.php' );
+require_once __DIR__ . '/Maintenance.php';
 
 /**
- * Maintenance script to create an account and grant it administrator rights.
+ * Maintenance script to create an account and grant it rights.
  *
  * @ingroup Maintenance
  */
 class CreateAndPromote extends Maintenance {
 
-	static $permitRoles = array( 'sysop', 'bureaucrat' );
+	static $permitRoles = array( 'sysop', 'bureaucrat', 'bot' );
 
 	public function __construct() {
 		parent::__construct();
 		$this->mDescription = "Create a new user account and/or grant it additional rights";
 		$this->addOption( "force", "If acccount exists already, just grant it rights or change password." );
-		foreach( self::$permitRoles as $role ) {
+		foreach ( self::$permitRoles as $role ) {
 			$this->addOption( $role, "Add the account to the {$role} group" );
 		}
 		$this->addArg( "username", "Username of new user" );
-		$this->addArg( "password", "Password to set (not required if --force is used)", false);
+		$this->addArg( "password", "Password to set (not required if --force is used)", false );
 	}
 
 	public function execute() {
@@ -60,10 +60,10 @@ class CreateAndPromote extends Maintenance {
 
 		if ( $exists && !$force ) {
 			$this->error( "Account exists. Perhaps you want the --force option?", true );
-		} else if ( !$exists && !$password ) {
+		} elseif ( !$exists && !$password ) {
 			$this->error( "Argument <password> required!", false );
 			$this->maybeHelp( true );
-		} else if ( $exists ) {
+		} elseif ( $exists ) {
 			$inGroups = $user->getGroups();
 		}
 
@@ -72,7 +72,7 @@ class CreateAndPromote extends Maintenance {
 		if ( $exists && !$password && count( $promotions ) === 0 ) {
 			$this->output( "Account exists and nothing to do.\n" );
 			return;
-		} else if ( count( $promotions ) !== 0 ) {
+		} elseif ( count( $promotions ) !== 0 ) {
 			$promoText = "User:{$username} into " . implode( ', ', $promotions ) . "...\n";
 			if ( $exists ) {
 				$this->output( wfWikiID() . ": Promoting $promoText" );
@@ -114,4 +114,4 @@ class CreateAndPromote extends Maintenance {
 }
 
 $maintClass = "CreateAndPromote";
-require_once( RUN_MAINTENANCE_IF_MAIN );
+require_once RUN_MAINTENANCE_IF_MAIN;
-- 
cgit v1.2.2