Revert "Use @ when accessing variables in templates"

Variables defined within a template can't be accessed with @.  This
change needs to be reworked to eliminate those cases.
This reverts commits 2c7da665 and ae197622.

1 files changed, 21 insertions, 21 deletions

diff --git a/modules/mediawiki/templates/LocalSettings.php b/modules/mediawiki/templates/LocalSettings.php
index c340dfd9..36b3054f 100644
--- a/modules/mediawiki/templates/LocalSettings.php
+++ b/modules/mediawiki/templates/LocalSettings.php
@@ -24,7 +24,7 @@ set_include_path( implode( PATH_SEPARATOR, $path ) . PATH_SEPARATOR . get_includ
 ## Uncomment this to disable output compression
 # $wgDisableOutputCompression = true;
 
-$wgSitename = "<%= @title %>";
+$wgSitename = "<%= title %>";
 # $wgMetaNamespace = ""; # Defaults to $wgSitename
 
 ## The URL base path to the directory containing the wiki;
@@ -32,7 +32,7 @@ $wgSitename = "<%= @title %>";
 ## For more information on customizing the URLs
 ## (like /w/index.php/Page_title to /wiki/Page_title) please see:
 ## https://www.mediawiki.org/wiki/Manual:Short_URL
-$wgScriptPath = "/<%= @path %>";
+$wgScriptPath = "/<%= path %>";
 
 ## The protocol and server name to use in fully-qualified URLs
 $wgServer = "https://wiki.mageia.org";
@@ -52,8 +52,8 @@ $wgLogo = "$wgStylePath/common/images/wiki_mga.png";
 $wgEnableEmail = true;
 $wgEnableUserEmail = true; # UPO
 
-$wgEmergencyContact = "root@<%= @domain %>";
-$wgPasswordSender = "wiki_noreply@ml.<%= @domain %>";
+$wgEmergencyContact = "root@<%= domain %>";
+$wgPasswordSender = "wiki_noreply@ml.<%= domain %>";
 
 $wgEnotifUserTalk = true; # UPO
 $wgEnotifWatchlist = true; # UPO
@@ -61,10 +61,10 @@ $wgEmailAuthentication = true;
 
 ## Database settings
 $wgDBtype = "postgres";
-$wgDBserver = "pg.<%= @domain %>";
-$wgDBname = "<%= @db_name %>";
-$wgDBuser = "<%= @db_user %>";
-$wgDBpassword = "<%= @db_password %>";
+$wgDBserver = "pg.<%= domain %>";
+$wgDBname = "<%= db_name %>";
+$wgDBuser = "<%= db_user %>";
+$wgDBpassword = "<%= db_password %>";
 
 # Postgres specific settings
 $wgDBport = "5432";
@@ -97,22 +97,22 @@ $wgShellLocale = "en_US.UTF-8";
 # This seems actually mandatory to get the Vector skin to work properly
 # https://serverfault.com/a/744059
 # FIXME: Dehardcode that path (maybe via ${wiki_root} if exposed?)
-$wgCacheDirectory = "/srv/wiki/<%= @path %>/cache";
+$wgCacheDirectory = "/srv/wiki/<%= path %>/cache";
 
-$wgUploadDirectory = "/srv/wiki/<%= @path %>/images";
+$wgUploadDirectory = "/srv/wiki/<%= path %>/images";
 
 # This seems mandatory to get the Vector skin to work properly
 # https://phabricator.wikimedia.org/T119934
 # FIXME: Dehardcode that path (maybe via ${wiki_root} if exposed?)
-$wgTmpDirectory = "/srv/wiki/<%= @path %>/tmp";
+$wgTmpDirectory = "/srv/wiki/<%= path %>/tmp";
 
 # Array of interwiki prefixes for current wiki.
 $wgLocalInterwikis = array( strtolower( $wgSitename ) );
 
 # Site language code, should be one of the list in ./languages/data/Names.php
-$wgLanguageCode = "<%= @lang %>";
+$wgLanguageCode = "<%= lang %>";
 
-$wgSecretKey = "<%= @secret_key %>";
+$wgSecretKey = "<%= secret_key %>";
 
 # Changing this will log out all existing sessions.
 $wgAuthenticationTokenVersion = "1";
@@ -180,19 +180,19 @@ $wgLDAPUseLocal = false;
 $wgLDAPDomainNames = array( 'ldap' );
 
 # TODO make it workable with more than one server
-$wgLDAPServerNames = array( 'ldap' => 'ldap.<%= @domain %>' );
+$wgLDAPServerNames = array( 'ldap' => 'ldap.<%= domain %>' );
 
-$wgLDAPSearchStrings = array( 'ldap' => 'uid=USER-NAME,ou=People,<%= @dc_suffix %>' );
+$wgLDAPSearchStrings = array( 'ldap' => 'uid=USER-NAME,ou=People,<%= dc_suffix %>' );
 
 $wgLDAPEncryptionType = array( 'ldap' => 'tls' );
 
-$wgLDAPBaseDNs = array( 'ldap' => '<%= @dc_suffix %>' );
-$wgLDAPUserBaseDNs = array( 'ldap' => 'ou=People,<%= @dc_suffix %>' );
-$wgLDAPGroupBaseDNs = array ( 'ldap' => 'ou=Group,<%= @dc_suffix %>' );
+$wgLDAPBaseDNs = array( 'ldap' => '<%= dc_suffix %>' );
+$wgLDAPUserBaseDNs = array( 'ldap' => 'ou=People,<%= dc_suffix %>' );
+$wgLDAPGroupBaseDNs = array ( 'ldap' => 'ou=Group,<%= dc_suffix %>' );
 
-$wgLDAPProxyAgent = array( 'ldap' => 'cn=mediawiki-alamut,ou=System Accounts,<%= @dc_suffix %>' );
+$wgLDAPProxyAgent = array( 'ldap' => 'cn=mediawiki-alamut,ou=System Accounts,<%= dc_suffix %>' );
 
-$wgLDAPProxyAgentPassword = array( 'ldap' => '<%= @ldap_password %>' );
+$wgLDAPProxyAgentPassword = array( 'ldap' => '<%= ldap_password %>' );
 
 $wgLDAPUseLDAPGroups = array( 'ldap' => true );
 $wgLDAPGroupNameAttribute = array( 'ldap' => 'cn' );
@@ -205,4 +205,4 @@ $wgLDAPLowerCaseUsername = array( 'ldap' => true );
 
 $wgLDAPPreferences = array( 'ldap' => array( 'email'=>'mail','realname'=>'cn','nickname'=>'uid','language'=>'preferredlanguage') );
 
-<%= @wiki_settings %>
+<%= wiki_settings %>