Treat "allmessagesnotsupporteddb" as wikitext when echoing; change default text

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 1102042..4c6cf3e 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -114,6 +114,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 5659) Change grammar hacks for Bosnian Wikimedia namespaces.
   This sort of special casing should be removed and fixed properly.
 * Remove useless whitespace from Special:Brokenredirects header
+* Treat "allmessagesnotsupporteddb" as wikitext when echoing; change default text
 
 == Compatibility ==
 

diff --git a/includes/SpecialAllmessages.php b/includes/SpecialAllmessages.php
index 040d9a0..926a062 100644 (file)
--- a/includes/SpecialAllmessages.php
+++ b/includes/SpecialAllmessages.php
@@ -12,8 +12,9 @@ function wfSpecialAllmessages() {
        global $wgOut, $wgAllMessagesEn, $wgRequest, $wgMessageCache, $wgTitle;
        global $wgUseDatabaseMessages;
 
-       if(!$wgUseDatabaseMessages) {
-               $wgOut->addHTML(wfMsg('allmessagesnotsupportedDB'));
+       # The page isn't much use if the MediaWiki namespace is not being used
+       if( !$wgUseDatabaseMessages ) {
+               $wgOut->addWikiText( wfMsg( 'allmessagesnotsupportedDB' ) );
                return;
        }
 

diff --git a/languages/Messages.php b/languages/Messages.php
index d026626..7b4796c 100644 (file)
--- a/languages/Messages.php
+++ b/languages/Messages.php
@@ -1441,9 +1441,9 @@ In the latter case you can also use a link, e.g. [[{{ns:Special}}:Export/{{Media
 'allmessagesname' => 'Name',
 'allmessagesdefault' => 'Default text',
 'allmessagescurrent' => 'Current text',
-'allmessagestext'      => 'This is a list of system messages available in the MediaWiki: namespace.',
+'allmessagestext'      => 'This is a list of system messages available in the MediaWiki namespace.',
 'allmessagesnotsupportedUI' => 'Your current interface language <b>$1</b> is not supported by Special:Allmessages at this site.',
-'allmessagesnotsupportedDB' => 'Special:Allmessages cannot be used because wgUseDatabaseMessages is off.',
+'allmessagesnotsupportedDB' => '\'\'\'Special:Allmessages\'\'\' cannot be used because \'\'\'$wgUseDatabaseMessages\'\'\' is switched off.',
 'allmessagesfilter' => 'Message name filter:',
 'allmessagesmodified' => 'Show only modified',