From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 6 Jun 2008 15:53:49 +0000 (+0000)
Subject: * (bug 14424) Fix regression in $wgRateLimitsExcludedGroups support
X-Git-Tag: 1.31.0-rc.0~47132
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=64b982ada49c22274473dd581f06dc873c8ee9cc;p=lhc%2Fweb%2Fwiklou.git

* (bug 14424) Fix regression in $wgRateLimitsExcludedGroups support

Fixes logic error introduced in r35908.
---

diff --git a/includes/User.php b/includes/User.php
index a3a7144651..5db907cb4b 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -1102,13 +1102,11 @@ class User {
 	 */
 	public function isPingLimitable() {
 		global $wgRateLimitsExcludedGroups;
-		if ( array_intersect($this->getEffectiveGroups(), $wgRateLimitsExcludedGroups) == array() || 
-			!$this->isAllowed('noratelimit') ) {
-				return true;
-			}
-		else {
+		if( array_intersect( $this->getEffectiveGroups(), $wgRateLimitsExcludedGroups ) ) {
+			// Deprecated, but kept for backwards-compatibility config
 			return false;
 		}
+		return !$this->isAllowed('noratelimit');
 	}
 
 	/**