Merge commit 'fa89acd'

# Conflicts:
#	.gitignore
#	extensions/ArchInterWiki.sql

1 files changed, 20 insertions, 1 deletions

diff --git a/maintenance/createAndPromote.php b/maintenance/createAndPromote.php
index 79f72542..861b364b 100644
--- a/maintenance/createAndPromote.php
+++ b/maintenance/createAndPromote.php
@@ -43,6 +43,14 @@ class CreateAndPromote extends Maintenance {
 		foreach ( self::$permitRoles as $role ) {
 			$this->addOption( $role, "Add the account to the {$role} group" );
 		}
+
+		$this->addOption(
+			'custom-groups',
+			'Comma-separated list of groups to add the user to',
+			false,
+			true
+		);
+
 		$this->addArg( "username", "Username of new user" );
 		$this->addArg( "password", "Password to set (not required if --force is used)", false );
 	}
@@ -69,8 +77,19 @@ class CreateAndPromote extends Maintenance {
 			$inGroups = $user->getGroups();
 		}
 
+		$groups = array_filter( self::$permitRoles, array( $this, 'hasOption' ) );
+		if ( $this->hasOption( 'custom-groups' ) ) {
+			$customGroupsText = $this->getOption( 'custom-groups' );
+			if ( $customGroupsText !== '' ) {
+				$customGroups = explode( ',', $customGroupsText );
+				foreach ( $customGroups as $customGroup ) {
+					$groups[] = trim( $customGroup );
+				}
+			}
+		}
+
 		$promotions = array_diff(
-			array_filter( self::$permitRoles, array( $this, 'hasOption' ) ),
+			$groups,
 			$inGroups
 		);