Show error message when 6730wgwgUseDatabaseMessages is off in Special:Allmessages...

diff --git a/includes/SpecialAllmessages.php b/includes/SpecialAllmessages.php
index 6e0e7a9..ea5a620 100644 (file)
--- a/includes/SpecialAllmessages.php
+++ b/includes/SpecialAllmessages.php
@@ -11,6 +11,19 @@
 function wfSpecialAllmessages() {
        global $wgOut, $wgAllMessagesEn, $wgRequest, $wgMessageCache, $wgTitle;
        global $wgLanguageCode, $wgContLanguageCode, $wgContLang;
+       global $wgUseDatabaseMessages;
+
+       if($wgLanguageCode != $wgContLanguageCode &&
+               !in_array($wgLanguageCode, $wgContLang->getVariants())) {
+               $err = wfMsg('allmessagesnotsupportedUI');
+               $wgOut->addHTML( $err );
+               return;
+       }
+       if(!$wgUseDatabaseMessages) {
+               $wgOut->addHTML(wfMsg('allmessagesnotsupportedDB'));
+               return;
+       }
+
        $fname = "wfSpecialAllMessages";
        wfProfileIn( $fname );
        
@@ -20,12 +33,6 @@ function wfSpecialAllmessages() {
        
        $navText = wfMsg( 'allmessagestext', $mwMsg->getSynonym( 0 ) );
 
-       if($wgLanguageCode != $wgContLanguageCode &&
-       !in_array($wgLanguageCode, $wgContLang->getVariants())) {
-               $err = wfMsg('allmessagesnotsupported');
-               $wgOut->addHTML( $err );
-               return;
-       }
 
        $first = true;
        $sortedArray = $wgAllMessagesEn;

diff --git a/languages/Language.php b/languages/Language.php
index d0ee9cd..39b0cd1 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1433,7 +1433,8 @@ article [[Train]].
 
 'allmessages'  => 'All system messages',
 'allmessagestext'      => 'This is a list of all system messages available in the MediaWiki: namespace.',
-'allmessagesnotsupported' => 'Your current interface language is not supported by Special:AllMessages at this site',
+'allmessagesnotsupportedUI' => 'Your current interface language is not supported by Special:AllMessages at this site.',
+'allmessagesnotsupportedDB' => 'Special:AllMessages not supported because wgUseDatabaseMessages is off.',
 
 # Thumbnails