From 835dfcaefaa402c6f7c46b222b94da30a33571bf Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 6 Oct 2012 13:42:03 +0100
Subject: Removed tpl_sidebar() to avoid fatal errors in other templates

Replaced it by the old tpl_include_page() and made it more flexible by adding a boolean $propagate parameter.
(It's false by default for backwards compatibility reasons. Should it rather be true? That would probably be what most users want.)
---
 lib/tpl/dokuwiki/main.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/tpl/dokuwiki')

diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index 6b1e95d62..820dd47df 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -42,7 +42,7 @@ $showSidebar = $hasSidebar && ($ACT=='show');
                     <div class="content">
                         <?php tpl_flush() ?>
                         <?php tpl_includeFile('sidebarheader.html') ?>
-                        <?php tpl_sidebar() ?>
+                        <?php tpl_include_page($conf['sidebar'], 1, 1) ?>
                         <?php tpl_includeFile('sidebarfooter.html') ?>
                     </div>
                 </div></div><!-- /aside -->
-- 
cgit v1.2.3