From: Tim Starling <tstarling@users.mediawiki.org>
Date: Tue, 31 Jan 2006 04:10:01 +0000 (+0000)
Subject: Feature karma: removing a useless feature that I recently committed.
X-Git-Tag: 1.6.0~392
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=742ab026697183d8e25c31ee41dc87a0068b9b71;p=lhc%2Fweb%2Fwiklou.git

Feature karma: removing a useless feature that I recently committed.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ce3e2faa4c..695b7441b5 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -341,7 +341,6 @@ Special Pages:
 * (bug 3192): properly check 'limit' parameter on Special:Contributions
 * (bug 3187) watchlist text refer to unexistent "Stop watching" action
 * Add block link and a link to the block log to Special:Contributions
-* Added $wgInvisibleGroups, to hide groups from Special:Listusers
 * Add contributions link to block log items
 
 Misc.:
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index f6ff4f2e88..87dba3befa 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -846,11 +846,6 @@ $wgGroupPermissions['bureaucrat']['userrights'] = true;
  */
 # $wgGroupPermissions['developer']['siteadmin'] = true;
 
-/**
- * List of groups which won't appear in Special:Listusers
- */
-$wgInvisibleGroups = array();
-
 /**
  * Set of available actions that can be restricted via Special:Protect
  * You probably shouldn't change this.
diff --git a/includes/SpecialListusers.php b/includes/SpecialListusers.php
index 1105ddf5e6..b2a35dd037 100644
--- a/includes/SpecialListusers.php
+++ b/includes/SpecialListusers.php
@@ -89,7 +89,7 @@ class ListUsersPage extends QueryPage {
 				wfMsgHtml( 'groups-editgroup-name' ) . '<select name="group">';
 
 		// get group names
-		$groups = User::getVisibleGroups();
+		$groups = User::getAllGroups();
 
 		// we want a default empty group
 		$out.= '<option value=""></option>';
@@ -185,9 +185,7 @@ class ListUsersPage extends QueryPage {
 				'ListUsersPage::formatResult' );
 			$groups = array();
 			while( $row = $dbr->fetchObject( $result ) ) {
-				if ( User::isVisibleGroup( $row->ug_group ) ) {
-					$groups[] = User::getGroupName( $row->ug_group );
-				}
+				$groups[] = User::getGroupName( $row->ug_group );
 			}
 			$dbr->freeResult( $result );
 
diff --git a/includes/User.php b/includes/User.php
index 02f7ec3d15..c95e5e89ba 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -1852,26 +1852,6 @@ class User {
 			array_keys( $wgGroupPermissions ),
 			array( '*', 'user', 'autoconfirmed' ) );
 	}
-
-	/**
-	 * Return the set of groups which are not marked "invisible"
-	 * @return array
-	 * @static
-	 */
-	function getVisibleGroups() {
-		global $wgGroupPermissions, $wgInvisibleGroups;
-		return array_diff( User::getAllGroups(), $wgInvisibleGroups );
-	}
-
-	/**
-	 * Determine if a given group name is a valid, visible group
-	 * @param string name
-	 * @return bool
-	 */
-	function isVisibleGroup( $group ) {
-		global $wgGroupPermissions, $wgInvisibleGroups;
-		return isset( $wgGroupPermissions[$group] ) && !in_array( $group, $wgInvisibleGroups );
-	}
 }
 
 ?>