From: Rob Church <robchurch@users.mediawiki.org>
Date: Fri, 8 Jun 2007 15:16:00 +0000 (+0000)
Subject: (bug 5908) Add "DEFAULTSORTKEY" and "DEFAULTCATEGORYSORT" aliases for "DEFAULTSORT... 
X-Git-Tag: 1.31.0-rc.0~52616
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=4e1cbf9bb82ebd3d11432e2808100225ce8b845a;p=lhc%2Fweb%2Fwiklou.git

(bug 5908) Add "DEFAULTSORTKEY" and "DEFAULTCATEGORYSORT" aliases for "DEFAULTSORT" magic word
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ef16df33c4..93eef9e745 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -67,6 +67,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 7997) Allow users to be blocked from using Special:Emailuser
 * (bug 8989) Blacklist 'mhtml' and 'mht' files from upload
 * (bug 8760) Allow wiki links in "protectexpiry" message
+* (bug 5908) Add "DEFAULTSORTKEY" and "DEFAULTCATEGORYSORT" aliases for
+  "DEFAULTSORT" magic word
 
 == Bugfixes since 1.10 ==
 
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 8b1522f3df..b2c874c535 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -338,7 +338,7 @@ $magicWords = array(
 	'padleft'                => array( 0,    'PADLEFT'                ),
 	'padright'               => array( 0,    'PADRIGHT'               ),
 	'special'                => array( 0,    'special',               ),
-	'defaultsort'            => array( 1,    'DEFAULTSORT:'           ),
+	'defaultsort'            => array( 1,    'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
 );
 
 /**