* (bug 13826) MediaWiki:Defaultns accepts Wikicode now

** 'Defaultns' moved from the legend of the fieldset into the fieldset as explanation text. Wikisyntax can now be used.
** New message 'prefs-namespaces' for the legend
* Tweak the search options a bit by adding a nice fieldset/legend (new message: 'prefs-searchoptions')

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 0c1a67d..f516f7f 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -310,6 +310,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 14273) Fix for HTTP Accept header parsing with spaces as from Konqueror
 * (bug 14312) Update LanguageKaa.php for handling transform issues with i to İ
   and I to ı
+* (bug 13826) MediaWiki:Defaultns accepts Wikicode
 
 === API changes in 1.13 ===
 

diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php
index a89c6cc..a79de27 100644 (file)
--- a/includes/SpecialPreferences.php
+++ b/includes/SpecialPreferences.php
@@ -1047,8 +1047,12 @@ class PreferencesForm {
                                Xml::check( 'wpDisableMWSuggest', $this->mDisableMWSuggest, array( 'id' => 'wpDisableMWSuggest' ) )
                        ) : '';
                $wgOut->addHTML(
+                       // Elements for the search tab itself
                        Xml::openElement( 'fieldset' ) .
                        Xml::element( 'legend', null, wfMsg( 'searchresultshead' ) ) .
+                       // Elements for the search options in the search tab
+                       Xml::openElement( 'fieldset' ) .
+                       Xml::element( 'legend', null, wfMsg( 'prefs-searchoptions' ) ) .
                        Xml::openElement( 'table' ) .
                        $ajaxsearch .
                        $this->addRow(
@@ -1065,10 +1069,14 @@ class PreferencesForm {
                        ) .
                        $mwsuggest .
                        Xml::closeElement( 'table' ) .
+                       Xml::closeElement( 'fieldset' ) .
+                       // Elements for the namespace options in the search tab
                        Xml::openElement( 'fieldset' ) .
-                       Xml::element( 'legend', null, wfMsg( 'defaultns' ) ) .
+                       Xml::element( 'legend', null, wfMsg( 'prefs-namespaces' ) ) .
+                       wfMsgExt( 'defaultns', array( 'parse' ) ) .
                        $ps .
                        Xml::closeElement( 'fieldset' ) .
+                       // End of the search tab
                        Xml::closeElement( 'fieldset' )
                );
 

diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php
index 83a5cae..cb25646 100644 (file)
--- a/languages/messages/MessagesDe.php
+++ b/languages/messages/MessagesDe.php
@@ -1035,6 +1035,8 @@ Wenn du dich mit dem Thema auskennst, kannst du selbst die Seite „[[$1]]“ ve
 'servertime'               => 'Aktuelle Zeit auf dem Server:',
 'guesstimezone'            => 'Vom Browser übernehmen',
 'allowemail'               => 'E-Mail-Empfang von anderen Benutzern ermöglichen',
+'prefs-searchoptions'      => 'Suchoptionen',
+'prefs-namespaces'         => 'Namensräume',
 'defaultns'                => 'In diesen Namensräumen soll standardmäßig gesucht werden:',
 'default'                  => 'Voreinstellung',
 'files'                    => 'Dateien',

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 64c0fb4..0c4cfc3 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1410,6 +1410,8 @@ please see math/README to configure.',
 'servertime'               => 'Server time',
 'guesstimezone'            => 'Fill in from browser',
 'allowemail'               => 'Enable e-mail from other users',
+'prefs-searchoptions'      => 'Search options',
+'prefs-namespaces'         => 'Namespaces',
 'defaultns'                => 'Search in these namespaces by default:',
 'default'                  => 'default',
 'files'                    => 'Files',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 5bbaff1..2235cf1 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -795,6 +795,8 @@ $wgMessageStructure = array(
                'servertime',
                'guesstimezone',
                'allowemail',
+               'prefs-searchoptions',
+               'prefs-namespaces',
                'defaultns',
                'default',
                'files',