From c8b7d7acf71a9babb7e76e91e4409d493bb11ef7 Mon Sep 17 00:00:00 2001 From: DanielSeifert Date: Tue, 1 Jul 2014 15:27:21 +0000 Subject: [PATCH] move smarty block extensions to if-checks: content will not rendered, if module is disabled --- .../views/blocks/layout/d3_base_googleadwordscode.tpl | 7 ++++++- .../views/blocks/layout/d3_base_googleanalytics.tpl | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/changed_full/470-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleadwordscode.tpl b/changed_full/470-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleadwordscode.tpl index 0c07579..626c837 100644 --- a/changed_full/470-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleadwordscode.tpl +++ b/changed_full/470-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleadwordscode.tpl @@ -1,9 +1,14 @@ [{$smarty.block.parent}] [{d3modcfgcheck modid="d3_googleanalytics"}] +[{/d3modcfgcheck}] + +[{if $mod_d3_googleanalytics}] + [{* Content shouldn't rendered in disabled module! + Because of this reason, it can't included in d3modcfgcheck block. *}] [{include file="d3ga_universal_adwordscode.tpl"}] [{include file="d3ga_universal_remarketing.tpl"}] [{include file="d3ga_universal_campaigncode.tpl"}] -[{/d3modcfgcheck}] \ No newline at end of file +[{/if}] \ No newline at end of file diff --git a/changed_full/470-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleanalytics.tpl b/changed_full/470-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleanalytics.tpl index fdef014..47a4eaa 100644 --- a/changed_full/470-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleanalytics.tpl +++ b/changed_full/470-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleanalytics.tpl @@ -1,5 +1,10 @@ [{$smarty.block.parent}] [{d3modcfgcheck modid="d3_googleanalytics"}] +[{/d3modcfgcheck}] + +[{if $mod_d3_googleanalytics}] + [{* Content shouldn't rendered in disabled module! + Because of this reason, it can't included in d3modcfgcheck block. *}] [{include file=$sD3GATTpl}] -[{/d3modcfgcheck}] \ No newline at end of file +[{/if}] \ No newline at end of file