dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
3827a5a
)
Merge "Fix for Bug 63980 - Comparison of limits in pingLimiter is incorrect"
author
jenkins-bot
<jenkins-bot@gerrit.wikimedia.org>
Sat, 4 Oct 2014 20:35:30 +0000
(20:35 +0000)
committer
Gerrit Code Review
<gerrit@wikimedia.org>
Sat, 4 Oct 2014 20:35:30 +0000
(20:35 +0000)
includes/User.php
patch
|
blob
|
history
diff --git
a/includes/User.php
b/includes/User.php
index
e25bc1f
..
e6425f8
100644
(file)
--- a/
includes/User.php
+++ b/
includes/User.php
@@
-1752,7
+1752,9
@@
class User implements IDBAccessObject {
// If more than one group applies, use the group with the highest limit
foreach ( $this->getGroups() as $group ) {
if ( isset( $limits[$group] ) ) {
- if ( $userLimit === false || $limits[$group] > $userLimit ) {
+ if ( $userLimit === false
+ || $limits[$group][0] / $limits[$group][1] > $userLimit[0] / $userLimit[1]
+ ) {
$userLimit = $limits[$group];
}
}