From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 8 May 2008 23:16:36 +0000 (+0000)
Subject: * (bug 12644) Template list on edit page now sorted on preview
X-Git-Tag: 1.31.0-rc.0~47797
X-Git-Url: https://git.cyclocoop.org/admin/?a=commitdiff_plain;h=1d55adfb4cc2ecd6de03ede1bf15f897a8e3757f;p=lhc%2Fweb%2Fwiklou.git

* (bug 12644) Template list on edit page now sorted on preview

On initial edit, items were sorted by virtue of being pulled from a sorted table, but on preview they were displayed in rough order of use in parsing, which is a bit less legible.

Added Title::compare() static comparator available as a callback for usort(), using it in Linker::formatTemplates().
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 88b3f2d493..8089db7a82 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -265,6 +265,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 14047) Fix regression in installer which hid DB-specific options.
   Also makes SQLite path configurable in the installer.
 * (bug 13546) Follow image redirects on image page
+* (bug 12644) Template list on edit page now sorted on preview
 
 === API changes in 1.13 ===
 
diff --git a/includes/Linker.php b/includes/Linker.php
index 037d12c8cf..a2d48c6b17 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1357,6 +1357,7 @@ class Linker {
 			}
 			$outText .= '</div><ul>';
 
+			usort( $templates, array( 'Title', 'compare' ) );
 			foreach ( $templates as $titleObj ) {
 				$r = $titleObj->getRestrictions( 'edit' );
 				if ( in_array( 'sysop', $r ) ) {
diff --git a/includes/Title.php b/includes/Title.php
index 70673acb37..9dc3b4e7bd 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -2935,6 +2935,17 @@ class Title {
 			&& $this->getDBkey() === $title->getDBkey();
 	}
 
+	/**
+	 * Callback for usort() to do title sorts by (namespace, title)
+	 */
+	static function compare( $a, $b ) {
+		if( $a->getNamespace() == $b->getNamespace() ) {
+			return strcmp( $a->getText(), $b->getText() );
+		} else {
+			return $a->getNamespace() - $b->getNamespace();
+		}
+	}
+
 	/**
 	 * Return a string representation of this title
 	 *