From 08aa4418c30cfc18ccc69a0f0f9cb9e17be6c196 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Mon, 12 Aug 2013 09:28:15 +0200 Subject: Update to MediaWiki 1.21.1 --- includes/Autopromote.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'includes/Autopromote.php') diff --git a/includes/Autopromote.php b/includes/Autopromote.php index 9c77855d..604b9248 100644 --- a/includes/Autopromote.php +++ b/includes/Autopromote.php @@ -54,7 +54,7 @@ class Autopromote { * Does not return groups the user already belongs to or has once belonged. * * @param $user User The user to get the groups for - * @param $event String key in $wgAutopromoteOnce (each one has groups/criteria) + * @param string $event key in $wgAutopromoteOnce (each one has groups/criteria) * * @return array Groups the user should be promoted to. * @@ -140,8 +140,8 @@ class Autopromote { return true; } } - # If we got here, the array presumably does not contain other condi- - # tions; it's not recursive. Pass it off to self::checkCondition. + // If we got here, the array presumably does not contain other conditions; + // it's not recursive. Pass it off to self::checkCondition. if ( !is_array( $cond ) ) { $cond = array( $cond ); } @@ -152,11 +152,11 @@ class Autopromote { /** * As recCheckCondition, but *not* recursive. The only valid conditions * are those whose first element is APCOND_EMAILCONFIRMED/APCOND_EDITCOUNT/ - * APCOND_AGE. Other types will throw an exception if no extension evalu- - * ates them. + * APCOND_AGE. Other types will throw an exception if no extension evaluates them. * - * @param $cond Array: A condition, which must not contain other conditions + * @param array $cond A condition, which must not contain other conditions * @param $user User The user to check the condition against + * @throws MWException * @return bool Whether the condition is true for the user */ private static function checkCondition( $cond, User $user ) { -- cgit v1.2.3-54-g00ecf