From c4044a97664690ed891e2ed0017d7ebbd543f3b9 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Sat, 20 Aug 2016 14:18:30 +0000 Subject: [PATCH] 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 --- templates/Settings.php.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/Settings.php.erb b/templates/Settings.php.erb index 4c7fa67..47e8586 100644 --- a/templates/Settings.php.erb +++ b/templates/Settings.php.erb @@ -42,7 +42,7 @@ $wgDBtype = "mysql"; $wgDBserver = "localhost"; $wgDBname = "openstack_wiki"; $wgDBuser = "wikiuser"; -$wgDBpassword = "<%= scope.lookupvar('::mediawiki::wg_dbpassword') %>"; +$wgDBpassword = "<%= @wg_dbpassword %>"; # MySQL specific settings $wgDBprefix = ""; @@ -117,11 +117,11 @@ $wgShellLocale = "en_US.utf8"; # Site language code, should be one of the list in ./languages/Names.php $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 # 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 ## appropriate copyright notice / icon. GNU Free Documentation @@ -290,7 +290,7 @@ require_once( "$IP/extensions/ReplaceText/ReplaceText.php" ); $wgGroupPermissions['sysop']['replacetext'] = true; require_once( "$IP/extensions/googleAnalytics/googleAnalytics.php" ); -$wgGoogleAnalyticsAccount = "<%= scope.lookupvar('::mediawiki::wg_googleanalyticsaccount') %>"; +$wgGoogleAnalyticsAccount = "<%= @wg_googleanalyticsaccount %>"; require_once( "$IP/extensions/Echo/Echo.php" );