From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Thu, 10 Jul 2008 07:09:46 +0000 (+0000)
Subject: * Fix regression in 37317, random content going into logs
X-Git-Tag: 1.31.0-rc.0~46591
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=b5147547227f24aa7f1cb1ec694c0d651c1a82d0;p=lhc%2Fweb%2Fwiklou.git

* Fix regression in 37317, random content going into logs
---

diff --git a/includes/specials/SpecialUserrights.php b/includes/specials/SpecialUserrights.php
index 28c9ca28a4..7fa21bc711 100644
--- a/includes/specials/SpecialUserrights.php
+++ b/includes/specials/SpecialUserrights.php
@@ -197,8 +197,8 @@ class UserrightsPage extends SpecialPage {
 			$user->getUserPage(),
 			$wgRequest->getText( 'user-reason' ),
 			array(
-				$this->makeGroupNameList( $oldGroups ),
-				$this->makeGroupNameList( $newGroups )
+				$this->makeGroupNameListForLog( $oldGroups ),
+				$this->makeGroupNameListForLog( $newGroups )
 			)
 		);
 	}
@@ -295,6 +295,14 @@ class UserrightsPage extends SpecialPage {
 		}
 	}
 
+	function makeGroupNameListForLog( $ids ) {
+		if( empty( $ids ) ) {
+			return '';
+		} else {
+			return $this->makeGroupNameList( $ids );
+		}
+	}
+
 	/**
 	 * Output a form to allow searching for a user
 	 */