From 77f70801f2ed9904b551c485abb2b1132956a1c1 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Thu, 26 Jan 2017 18:09:24 +0100
Subject: [PATCH] Fixed sidebars only containing ads

---
 com.woltlab.wcf/templates/footer.tpl | 72 ++++++++++++++--------------
 1 file changed, 37 insertions(+), 35 deletions(-)

diff --git a/com.woltlab.wcf/templates/footer.tpl b/com.woltlab.wcf/templates/footer.tpl
index c8d8956f11..cf6796075e 100644
--- a/com.woltlab.wcf/templates/footer.tpl
+++ b/com.woltlab.wcf/templates/footer.tpl
@@ -16,49 +16,51 @@
 					{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.footer.content')}
 				{/if}
 			</div>
-			
-			{hascontent}
+				
+			{capture assign='__sidebarRightContent'}
+				{event name='boxesSidebarRightTop'}
+				
+				{* WCF2.1 Fallback *}
+				{if !$sidebar|empty}
+					{if !$sidebarOrientation|isset || $sidebarOrientation == 'right'}
+						{@$sidebar}
+					{/if}
+				{/if}
+				
+				{if !$sidebarRight|empty}
+					{@$sidebarRight}
+				{/if}
+				
+				{foreach from=$__wcf->getBoxHandler()->getBoxes('sidebarRight') item=box}
+					{@$box->render()}
+				{/foreach}
+				
+				{event name='boxesSidebarRightBottom'}
+			{/capture}
+				
+			{if $__sidebarRightContent|trim}
 				<aside class="sidebar boxesSidebarRight">
 					<div class="boxContainer">
-						{content}
-							{if MODULE_WCF_AD && $__disableAds|empty && $__wcf->getAdHandler()->getAds('com.woltlab.wcf.sidebar.top')}
-								<div class="box boxBorderless">
-									<div class="boxContent">
-										{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.sidebar.top')}
-									</div>
+						{if MODULE_WCF_AD && $__disableAds|empty && $__wcf->getAdHandler()->getAds('com.woltlab.wcf.sidebar.top')}
+							<div class="box boxBorderless">
+								<div class="boxContent">
+									{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.sidebar.top')}
 								</div>
-							{/if}
+							</div>
+						{/if}
 							
-							{event name='boxesSidebarRightTop'}
-													
-							{* WCF2.1 Fallback *}
-							{if !$sidebar|empty}
-								{if !$sidebarOrientation|isset || $sidebarOrientation == 'right'}
-									{@$sidebar}
-								{/if}
-							{/if}
-							
-							{if !$sidebarRight|empty}
-								{@$sidebarRight}
-							{/if}
-							
-							{foreach from=$__wcf->getBoxHandler()->getBoxes('sidebarRight') item=box}
-								{@$box->render()}
-							{/foreach}
-						
-							{event name='boxesSidebarRightBottom'}
+						{@$__sidebarRightContent}	
 						
-							{if MODULE_WCF_AD && $__disableAds|empty && $__wcf->getAdHandler()->getAds('com.woltlab.wcf.sidebar.bottom')}
-								<div class="box boxBorderless">
-									<div class="boxContent">
-										{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.sidebar.bottom')}
-									</div>
+						{if MODULE_WCF_AD && $__disableAds|empty && $__wcf->getAdHandler()->getAds('com.woltlab.wcf.sidebar.bottom')}
+							<div class="box boxBorderless">
+								<div class="boxContent">
+									{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.sidebar.bottom')}
 								</div>
-							{/if}	
-						{/content}
+							</div>
+						{/if}
 					</div>
 				</aside>
-			{/hascontent}
+			{/if}
 		</div>
 	</section>
 	
-- 
2.20.1