diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2012-04-07 20:20:22 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2012-04-07 20:20:22 +0200 |
| commit | e5d4768d27336a3af2fc36af663d21a1a57d0ee1 (patch) | |
| tree | d6755f004a8076f39c46d633d22386e5b1965881 /lib/tpl/dokuwiki/main.php | |
| parent | 42ff673048d169bcbec5e4bb17619d66e6f6f61d (diff) | |
| download | rpg-e5d4768d27336a3af2fc36af663d21a1a57d0ee1.tar.gz rpg-e5d4768d27336a3af2fc36af663d21a1a57d0ee1.tar.bz2 | |
added tpl_includeFile() to core
Diffstat (limited to 'lib/tpl/dokuwiki/main.php')
| -rw-r--r-- | lib/tpl/dokuwiki/main.php | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index 9bc221711..57c94f174 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -9,7 +9,6 @@ */ if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */ -@require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show'); ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" @@ -23,7 +22,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show <?php tpl_metaheaders() ?> <meta name="viewport" content="width=device-width,initial-scale=1" /> <?php echo tpl_favicon(array('favicon', 'mobile')) ?> - <?php _tpl_include('meta.html') ?> + <?php tpl_includeFile('meta.html') ?> </head> <body> @@ -39,9 +38,9 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show <!-- ********** ASIDE ********** --> <div id="dokuwiki__aside"><div class="pad include group"> <?php tpl_flush() ?> - <?php _tpl_include('sidebarheader.html') ?> + <?php tpl_includeFile('sidebarheader.html') ?> <?php tpl_include_page($conf['sidebar']) ?> - <?php _tpl_include('sidebarfooter.html') ?> + <?php tpl_includeFile('sidebarfooter.html') ?> </div></div><!-- /aside --> <?php endif; ?> @@ -52,11 +51,11 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show <div class="page group"> <?php tpl_flush() ?> - <?php _tpl_include('pageheader.html') ?> + <?php tpl_includeFile('pageheader.html') ?> <!-- wikipage start --> <?php tpl_content() ?> <!-- wikipage stop --> - <?php _tpl_include('pagefooter.html') ?> + <?php tpl_includeFile('pagefooter.html') ?> </div> <div class="docInfo"><?php tpl_pageinfo() ?></div> |