dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove duplicate names from CREDITS
[lhc/web/wiklou.git]
/
includes
/
Autopromote.php
diff --git
a/includes/Autopromote.php
b/includes/Autopromote.php
index
d492d19
..
a01465e
100644
(file)
--- a/
includes/Autopromote.php
+++ b/
includes/Autopromote.php
@@
-35,7
+35,7
@@
class Autopromote {
public static function getAutopromoteGroups( User $user ) {
global $wgAutopromote;
public static function getAutopromoteGroups( User $user ) {
global $wgAutopromote;
- $promote =
array()
;
+ $promote =
[]
;
foreach ( $wgAutopromote as $group => $cond ) {
if ( self::recCheckCondition( $cond, $user ) ) {
foreach ( $wgAutopromote as $group => $cond ) {
if ( self::recCheckCondition( $cond, $user ) ) {
@@
-43,7
+43,7
@@
class Autopromote {
}
}
}
}
- Hooks::run( 'GetAutoPromoteGroups',
array( $user, &$promote )
);
+ Hooks::run( 'GetAutoPromoteGroups',
[ $user, &$promote ]
);
return $promote;
}
return $promote;
}
@@
-63,7
+63,7
@@
class Autopromote {
public static function getAutopromoteOnceGroups( User $user, $event ) {
global $wgAutopromoteOnce;
public static function getAutopromoteOnceGroups( User $user, $event ) {
global $wgAutopromoteOnce;
- $promote =
array()
;
+ $promote =
[]
;
if ( isset( $wgAutopromoteOnce[$event] ) && count( $wgAutopromoteOnce[$event] ) ) {
$currentGroups = $user->getGroups();
if ( isset( $wgAutopromoteOnce[$event] ) && count( $wgAutopromoteOnce[$event] ) ) {
$currentGroups = $user->getGroups();
@@
-104,7
+104,7
@@
class Autopromote {
* @return bool Whether the condition is true
*/
private static function recCheckCondition( $cond, User $user ) {
* @return bool Whether the condition is true
*/
private static function recCheckCondition( $cond, User $user ) {
- $validOps =
array( '&', '|', '^', '!' )
;
+ $validOps =
[ '&', '|', '^', '!' ]
;
if ( is_array( $cond ) && count( $cond ) >= 2 && in_array( $cond[0], $validOps ) ) {
# Recursive condition
if ( is_array( $cond ) && count( $cond ) >= 2 && in_array( $cond[0], $validOps ) ) {
# Recursive condition
@@
-144,7
+144,7
@@
class Autopromote {
// 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 ) ) {
// 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 )
;
+ $cond =
[ $cond ]
;
}
return self::checkCondition( $cond, $user );
}
return self::checkCondition( $cond, $user );
@@
-177,7
+177,13
@@
class Autopromote {
}
return false;
case APCOND_EDITCOUNT:
}
return false;
case APCOND_EDITCOUNT:
- return $user->getEditCount() >= $cond[1];
+ $reqEditCount = $cond[1];
+
+ // T157718: Avoid edit count lookup if specified edit count is 0 or invalid
+ if ( $reqEditCount <= 0 ) {
+ return true;
+ }
+ return $user->getEditCount() >= $reqEditCount;
case APCOND_AGE:
$age = time() - wfTimestampOrNull( TS_UNIX, $user->getRegistration() );
return $age >= $cond[1];
case APCOND_AGE:
$age = time() - wfTimestampOrNull( TS_UNIX, $user->getRegistration() );
return $age >= $cond[1];
@@
-197,8
+203,8
@@
class Autopromote {
return in_array( 'bot', User::getGroupPermissions( $user->getGroups() ) );
default:
$result = null;
return in_array( 'bot', User::getGroupPermissions( $user->getGroups() ) );
default:
$result = null;
- Hooks::run( 'AutopromoteCondition',
array(
$cond[0],
- array_slice( $cond, 1 ), $user, &$result
)
);
+ Hooks::run( 'AutopromoteCondition',
[
$cond[0],
+ array_slice( $cond, 1 ), $user, &$result
]
);
if ( $result === null ) {
throw new MWException( "Unrecognized condition {$cond[0]} for autopromotion!" );
}
if ( $result === null ) {
throw new MWException( "Unrecognized condition {$cond[0]} for autopromotion!" );
}