Update scope.lookupvar() calls to shorter @ lookup
Consistent with the vhost template, in Settings.php.erb use the shorter @ lookups rather than calling the scope.lookupvar() function. Change-Id: Ic03dbb55e4931d334a2cf5d4fae6a07cf53dd807
This commit is contained in:
parent
4cbe39375c
commit
c4044a9766
@ -42,7 +42,7 @@ $wgDBtype = "mysql";
|
|||||||
$wgDBserver = "localhost";
|
$wgDBserver = "localhost";
|
||||||
$wgDBname = "openstack_wiki";
|
$wgDBname = "openstack_wiki";
|
||||||
$wgDBuser = "wikiuser";
|
$wgDBuser = "wikiuser";
|
||||||
$wgDBpassword = "<%= scope.lookupvar('::mediawiki::wg_dbpassword') %>";
|
$wgDBpassword = "<%= @wg_dbpassword %>";
|
||||||
|
|
||||||
# MySQL specific settings
|
# MySQL specific settings
|
||||||
$wgDBprefix = "";
|
$wgDBprefix = "";
|
||||||
@ -117,11 +117,11 @@ $wgShellLocale = "en_US.utf8";
|
|||||||
# Site language code, should be one of the list in ./languages/Names.php
|
# Site language code, should be one of the list in ./languages/Names.php
|
||||||
$wgLanguageCode = "en";
|
$wgLanguageCode = "en";
|
||||||
|
|
||||||
$wgSecretKey = "<%= scope.lookupvar('::mediawiki::wg_secretkey') %>";
|
$wgSecretKey = "<%= @wg_secretkey %>";
|
||||||
|
|
||||||
# Site upgrade key. Must be set to a string (default provided) to turn on the
|
# Site upgrade key. Must be set to a string (default provided) to turn on the
|
||||||
# web installer while LocalSettings.php is in place
|
# web installer while LocalSettings.php is in place
|
||||||
$wgUpgradeKey = "<%= scope.lookupvar('::mediawiki::wg_upgradekey') %>";
|
$wgUpgradeKey = "<%= @wg_upgradekey %>";
|
||||||
|
|
||||||
## For attaching licensing metadata to pages, and displaying an
|
## For attaching licensing metadata to pages, and displaying an
|
||||||
## appropriate copyright notice / icon. GNU Free Documentation
|
## appropriate copyright notice / icon. GNU Free Documentation
|
||||||
@ -290,7 +290,7 @@ require_once( "$IP/extensions/ReplaceText/ReplaceText.php" );
|
|||||||
$wgGroupPermissions['sysop']['replacetext'] = true;
|
$wgGroupPermissions['sysop']['replacetext'] = true;
|
||||||
|
|
||||||
require_once( "$IP/extensions/googleAnalytics/googleAnalytics.php" );
|
require_once( "$IP/extensions/googleAnalytics/googleAnalytics.php" );
|
||||||
$wgGoogleAnalyticsAccount = "<%= scope.lookupvar('::mediawiki::wg_googleanalyticsaccount') %>";
|
$wgGoogleAnalyticsAccount = "<%= @wg_googleanalyticsaccount %>";
|
||||||
|
|
||||||
require_once( "$IP/extensions/Echo/Echo.php" );
|
require_once( "$IP/extensions/Echo/Echo.php" );
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user