From: Marcel Werk Date: Wed, 18 Feb 2015 11:17:58 +0000 (+0100) Subject: Disabled ad locations on non-content pages X-Git-Tag: 2.1.0_RC_2~33 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c893138d2087c72681481fcfd6ade6beeb0e504d;p=GitHub%2FWoltLab%2FWCF.git Disabled ad locations on non-content pages --- diff --git a/com.woltlab.wcf/templates/footer.tpl b/com.woltlab.wcf/templates/footer.tpl index 48b0d0daac..41a5e762f7 100644 --- a/com.woltlab.wcf/templates/footer.tpl +++ b/com.woltlab.wcf/templates/footer.tpl @@ -2,7 +2,7 @@ {if $skipBreadcrumbs|empty}{include file='breadcrumbs' __microdata=false}{/if} - {if MODULE_WCF_AD} + {if MODULE_WCF_AD && $__disableAds|empty} {@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.footer.content')} {/if} @@ -40,7 +40,7 @@ {event name='copyright'} - {if MODULE_WCF_AD} + {if MODULE_WCF_AD && $__disableAds|empty} {@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.footer.bottom')} {/if} diff --git a/com.woltlab.wcf/templates/header.tpl b/com.woltlab.wcf/templates/header.tpl index bb52801524..00377dda8a 100644 --- a/com.woltlab.wcf/templates/header.tpl +++ b/com.woltlab.wcf/templates/header.tpl @@ -20,7 +20,7 @@

- {if MODULE_WCF_AD}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.logo')}{/if} + {if MODULE_WCF_AD && $__disableAds|empty}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.logo')}{/if} {if $__wcf->getStyleHandler()->getStyle()->getPageLogo()} @@ -56,7 +56,7 @@ {if $sidebar|isset} @@ -85,7 +85,7 @@ {/if}

- {if MODULE_WCF_AD}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.header.content')}{/if} + {if MODULE_WCF_AD && $__disableAds|empty}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.header.content')}{/if} {event name='contents'} diff --git a/com.woltlab.wcf/templates/login.tpl b/com.woltlab.wcf/templates/login.tpl index 8a5a247941..72025b2d81 100644 --- a/com.woltlab.wcf/templates/login.tpl +++ b/com.woltlab.wcf/templates/login.tpl @@ -15,7 +15,7 @@ -{include file='header' __disableLoginLink=true} +{include file='header' __disableLoginLink=true __disableAds=true}

{lang}wcf.user.login{/lang}

@@ -160,7 +160,7 @@

-{include file='footer'} +{include file='footer' __disableAds=true} diff --git a/com.woltlab.wcf/templates/redirect.tpl b/com.woltlab.wcf/templates/redirect.tpl index c34cd40401..7d3c62e98b 100644 --- a/com.woltlab.wcf/templates/redirect.tpl +++ b/com.woltlab.wcf/templates/redirect.tpl @@ -10,14 +10,14 @@ -{include file='header'} +{include file='header' __disableAds=true}

{@$message}

{lang}wcf.global.redirect.url{/lang}

-{include file='footer'} +{include file='footer' __disableAds=true} diff --git a/com.woltlab.wcf/templates/userException.tpl b/com.woltlab.wcf/templates/userException.tpl index 9b24e4b646..b04be1a47a 100644 --- a/com.woltlab.wcf/templates/userException.tpl +++ b/com.woltlab.wcf/templates/userException.tpl @@ -7,7 +7,7 @@ -{include file='header'} +{include file='header' __disableAds=true}

{@$message} @@ -28,7 +28,7 @@ --> {/if} -{include file='footer'} +{include file='footer' __disableAds=true}