From ea0e4b9917673d4d35d76b6365522ebb4263abdc Mon Sep 17 00:00:00 2001
From: Andrew Garrett <werdna@users.mediawiki.org>
Date: Wed, 2 Apr 2008 00:27:30 +0000
Subject: [PATCH] Remove 8-group limit for putting Userrights options in
 columns - so they will always be in columns

---
 includes/SpecialUserrights.php | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/includes/SpecialUserrights.php b/includes/SpecialUserrights.php
index 9842ae2f30..1118365412 100644
--- a/includes/SpecialUserrights.php
+++ b/includes/SpecialUserrights.php
@@ -402,13 +402,9 @@ class UserrightsPage extends SpecialPage {
 		$allgroups = User::getAllGroups();
 		$ret = '';
 		
-		if (count($allgroups)>8) {
-			$column = 1;
-			$settable_col = '';
-			$unsettable_col = '';
-		} else {
-			$column = 0;
-		}
+		$column = 1;
+		$settable_col = '';
+		$unsettable_col = '';
 		
 		foreach ($allgroups as $group) {
 			$set = in_array( $group, $usergroups );
@@ -421,14 +417,10 @@ class UserrightsPage extends SpecialPage {
 					"wpGroup-$group", $set, $attr );
 			$checkbox = $disabled ? "<span class='mw-userrights-disabled'>$checkbox</span>" : $checkbox;
 				
-			if ($column) {
-				if ($disabled) {
-					$unsettable_col .= "$checkbox<br/>\n";
-				} else {
-					$settable_col .= "$checkbox<br/>\n";
-				}
+			if ($disabled) {
+				$unsettable_col .= "$checkbox<br/>\n";
 			} else {
-				$ret .= " $checkbox ";
+				$settable_col .= "$checkbox<br/>\n";
 			}
 		}
 		
-- 
2.20.1