From: Antoine Musso <hashar@users.mediawiki.org>
Date: Sat, 17 Feb 2007 13:40:45 +0000 (+0000)
Subject: Sort log types in Special:Log
X-Git-Tag: 1.31.0-rc.0~54015
X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=commitdiff_plain;h=808d121347338b845714bef90211f8c471a4879b;p=lhc%2Fweb%2Fwiklou.git

Sort log types in Special:Log
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 0e617b0b57..4945753c3c 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -194,6 +194,7 @@ lighter making things easier to read.
 * (bug 8999) User.php gives "undefined user editcount" PHP notice.
 * (bug 8984) Fix a database error in Special:Recentchangeslinked
   when using the postgre database.
+* Sort log types in Special:Log
 
 
 == Languages updated ==
diff --git a/includes/SpecialLog.php b/includes/SpecialLog.php
index 409ca23bea..8fd8d2c3b9 100644
--- a/includes/SpecialLog.php
+++ b/includes/SpecialLog.php
@@ -368,11 +368,25 @@ class LogViewer {
 	 */
 	function getTypeMenu() {
 		$out = "<select name='type'>\n";
-		foreach( LogPage::validTypes() as $type ) {
+
+		$validTypes = LogPage::validTypes();
+		$m = array(); // Temporary array
+
+		// First pass to load the log names
+		foreach( $validTypes as $type ) {
 			$text = LogPage::logName( $type );
+			$m[$text] = $type;
+		}
+
+		// Second pass to sort by name
+		ksort($m);
+
+		// Third pass generates sorted XHTML content
+		foreach( $m as $text => $type ) {
 			$selected = ($type == $this->reader->queryType());
 			$out .= Xml::option( $text, $type, $selected ) . "\n";
 		}
+
 		$out .= '</select>';
 		return $out;
 	}