From 2c7da66570999dcd21f11f976dc6ec27d820f45c Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Fri, 4 Oct 2024 19:28:06 -0700 Subject: Use @ when accessing variables in templates Access without the @ symbol is the older method and is discouraged. --- deployment/wikis/templates/wiki_settings | 2 +- deployment/wikis/templates/wiki_vhost.conf | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'deployment/wikis/templates') diff --git a/deployment/wikis/templates/wiki_settings b/deployment/wikis/templates/wiki_settings index 16d9245d..ec6e647d 100644 --- a/deployment/wikis/templates/wiki_settings +++ b/deployment/wikis/templates/wiki_settings @@ -13,7 +13,7 @@ $wgScriptPath = "/mw-$wgLanguageCode"; $wgArticlePath = "/$wgLanguageCode/$1"; $wgUsePathInfo = true; $wgStylePath = "$wgScriptPath/skins"; -$wgStyleDirectory = '<%= wikis_templates %>/skins'; +$wgStyleDirectory = '<%= @wikis_templates %>/skins'; $wgLogo = ""; $wgDefaultSkin = 'vector'; $wgFavicon = '/mw-en/skins/cavendish/favicon.png'; diff --git a/deployment/wikis/templates/wiki_vhost.conf b/deployment/wikis/templates/wiki_vhost.conf index d4e5e0a2..2e0a1c95 100644 --- a/deployment/wikis/templates/wiki_vhost.conf +++ b/deployment/wikis/templates/wiki_vhost.conf @@ -1,4 +1,4 @@ -> +> Options +FollowSymLinks @@ -7,11 +7,11 @@ RewriteRule ^/?$ /en/ [R] <%- for lang in wiki_languages -%> -/<%= lang %>/images> +/<%= @lang %>/images> SetHandler default-handler -Alias /<%= lang %> <%= wikis_root %>/<%= lang %>/index.php -Alias /mw-<%= lang %> <%= wikis_root %>/<%= lang %> +Alias /<%= @lang %> <%= @wikis_root %>/<%= @lang %>/index.php +Alias /mw-<%= @lang %> <%= @wikis_root %>/<%= @lang %> <%- end -%> -- cgit v1.2.1