diff options
| author | Anika Henke <anika@selfthinker.org> | 2012-10-06 13:42:03 +0100 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2012-10-06 13:42:03 +0100 |
| commit | 835dfcaefaa402c6f7c46b222b94da30a33571bf (patch) | |
| tree | 7ad551bc580ea1f2a63425a0efac3709cf591fcd /lib | |
| parent | c973a9c8b8f30a6c0c2122b87fd9c44af16ffec3 (diff) | |
| download | rpg-835dfcaefaa402c6f7c46b222b94da30a33571bf.tar.gz rpg-835dfcaefaa402c6f7c46b222b94da30a33571bf.tar.bz2 | |
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.)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/tpl/dokuwiki/main.php | 2 |
1 files changed, 1 insertions, 1 deletions
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 --> |