Merge remote-tracking branch 'svnexport/master'

8 years ago · e56727fe09
parent 061a96fea3 e3ade3e4b2
commit e56727fe09
1 changed files with 4 additions and 2 deletions
--- a/list-virtual.php
+++ b/list-virtual.php
@ -450,8 +450,10 @@ $smarty->assign ('tDisplay_up_show', $tDisplay_up_show);
 $smarty->assign ('tDisplay_next_show', $tDisplay_next_show);
 $smarty->assign ('tDisplay_next', $tDisplay_next);

-$smarty->assign ('tAliasDomains', $tAliasDomains);
-$smarty->assign ('aliasdomain_data', $aliasdomain_data);
+if (Config::bool('alias_domain')) {
+    $smarty->assign ('tAliasDomains', $tAliasDomains);
+    $smarty->assign ('aliasdomain_data', $aliasdomain_data);
+}

 $smarty->assign ('tAlias', $tAlias);
 $smarty->assign ('alias_data', $alias_data);