Fixed sidebars only containing ads

diff --git a/com.woltlab.wcf/templates/footer.tpl b/com.woltlab.wcf/templates/footer.tpl
index c8d8956f111078c4362c6831a1449c5ca0ef2def..cf6796075ed5f4fdc29f4ddb952d7250ec6d1935 100644 (file)
--- 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>