http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73990

Revision: 73990
Author:   tparscal
Date:     2010-09-29 22:08:35 +0000 (Wed, 29 Sep 2010)

Log Message:
-----------
Moved wgDBName out of $wgUseAjax / $wgEnableMWSuggest conditional - this needs 
to be done in deployment as well. This is needed for central notice work.

Modified Paths:
--------------
    branches/wmf/1.16wmf4/includes/Skin.php

Modified: branches/wmf/1.16wmf4/includes/Skin.php
===================================================================
--- branches/wmf/1.16wmf4/includes/Skin.php     2010-09-29 22:07:09 UTC (rev 
73989)
+++ branches/wmf/1.16wmf4/includes/Skin.php     2010-09-29 22:08:35 UTC (rev 
73990)
@@ -425,6 +425,7 @@
                        'wgNamespaceIds' => $wgContLang->getNamespaceIds(),
                        'wgSiteName' => $wgSitename,
                        'wgCategories' => $wgOut->getCategories(),
+                       'wgDBname' => $wgDBname,
                );
                if ( $wgContLang->hasVariants() ) {
                        $vars['wgUserVariant'] = 
$wgContLang->getPreferredVariant();
@@ -438,7 +439,6 @@
 
                if( $wgUseAjax && $wgEnableMWSuggest && !$wgUser->getOption( 
'disablesuggest', false ) ) {
                        $vars['wgMWSuggestTemplate'] = 
SearchEngine::getMWSuggestTemplate();
-                       $vars['wgDBname'] = $wgDBname;
                        $vars['wgSearchNamespaces'] = 
SearchEngine::userNamespaces( $wgUser );
                        $vars['wgMWSuggestMessages'] = array( wfMsg( 
'search-mwsuggest-enabled' ), wfMsg( 'search-mwsuggest-disabled' ) );
                }



_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to