diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2012-07-01 14:36:57 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2012-07-01 14:36:57 +0200 |
| commit | 35a00f69494a05af349fa86a0fbd4f7641a384e4 (patch) | |
| tree | c4a2c161e026f8ff854cc4ce7cb63ca946ea67ce /lib | |
| parent | 578b2c23b773d74f9fc04c48baa5f826020209ba (diff) | |
| parent | e66d3e6dfa7ba6f0cf55b58f0b00b66b52c98321 (diff) | |
| download | rpg-35a00f69494a05af349fa86a0fbd4f7641a384e4.tar.gz rpg-35a00f69494a05af349fa86a0fbd4f7641a384e4.tar.bz2 | |
Merge branch 'sidebar'
* sidebar:
Improved sidebar inclusion
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/tpl/dokuwiki/detail.php | 2 | ||||
| -rw-r--r-- | lib/tpl/dokuwiki/main.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php index a3516a7ed..5fe1a1ad7 100644 --- a/lib/tpl/dokuwiki/detail.php +++ b/lib/tpl/dokuwiki/detail.php @@ -10,7 +10,7 @@ // must be run from within DokuWiki if (!defined('DOKU_INC')) die(); -$showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show'); +$showSidebar = page_findnearest($conf['sidebar']) && ($ACT=='show'); ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang']?>" diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index d8e85850f..e0b046574 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -10,7 +10,7 @@ if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */ -$showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show'); +$showSidebar = page_findnearest($conf['sidebar']) && ($ACT=='show'); ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang'] ?>" @@ -41,7 +41,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show <div class="content"> <?php tpl_flush() ?> <?php tpl_includeFile('sidebarheader.html') ?> - <?php tpl_include_page($conf['sidebar']) ?> + <?php tpl_sidebar() ?> <?php tpl_includeFile('sidebarfooter.html') ?> </div> </div></div><!-- /aside --> |