From d386b375f2c06fdac5e2d3537fd26dff174ea8b0 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 26 Aug 2012 18:06:52 +0100
Subject: [PATCH] use core tpl_includeFile() if it exists

---
 detail.php        |  2 +-
 main.php          | 10 +++++-----
 mediamanager.php  |  2 +-
 tpl_functions.php |  7 +++++++
 4 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/detail.php b/detail.php
index 25a9e35..1cf7ce0 100644
--- a/detail.php
+++ b/detail.php
@@ -25,7 +25,7 @@ if (!defined('DOKU_INC')) die();
     <?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>
diff --git a/main.php b/main.php
index c2a8edd..2497003 100644
--- a/main.php
+++ b/main.php
@@ -22,7 +22,7 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
     <?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>
@@ -37,7 +37,7 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
     <div id="dokuwiki__site"><div id="dokuwiki__top"
         class="dokuwiki site mode_<?php echo $ACT ?>">
         <?php html_msgarea() /* occasional error and info messages on top of the page */ ?>
-        <?php _tpl_include('header.html') ?>
+        <?php tpl_includeFile('header.html') ?>
 
         <!-- ********** HEADER ********** -->
         <div id="dokuwiki__header"><div class="pad">
@@ -120,7 +120,7 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
             <!-- ********** CONTENT ********** -->
             <div id="dokuwiki__content"><div class="pad">
                 <?php tpl_flush() /* flush the output buffer */ ?>
-                <?php _tpl_include('pageheader.html') ?>
+                <?php tpl_includeFile('pageheader.html') ?>
 
                 <div class="page">
                     <!-- wikipage start -->
@@ -130,7 +130,7 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
                 </div>
 
                 <?php tpl_flush() ?>
-                <?php _tpl_include('pagefooter.html') ?>
+                <?php tpl_includeFile('pagefooter.html') ?>
             </div></div><!-- /content -->
 
             <div class="clearer"></div>
@@ -161,7 +161,7 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
             <?php tpl_license('button') /* content license, parameters: img=*badge|button|0, imgonly=*0|1, return=*0|1 */ ?>
         </div></div><!-- /footer -->
 
-        <?php _tpl_include('footer.html') ?>
+        <?php tpl_includeFile('footer.html') ?>
     </div></div><!-- /site -->
 
     <div class="no"><?php tpl_indexerWebBug() /* provide DokuWiki housekeeping, required in all templates */ ?></div>
diff --git a/mediamanager.php b/mediamanager.php
index 8e1abac..489f045 100644
--- a/mediamanager.php
+++ b/mediamanager.php
@@ -23,7 +23,7 @@ if (!defined('DOKU_INC')) die();
     <?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>
diff --git a/tpl_functions.php b/tpl_functions.php
index cf6a4e5..a68e45c 100644
--- a/tpl_functions.php
+++ b/tpl_functions.php
@@ -187,3 +187,10 @@ function _tpl_include($fn) {
     else if (file_exists($tplFile))
         include($tplFile);
 }
+
+/* use core function if available, otherwise the custom one */
+if (!function_exists('tpl_includeFile')) {
+    function tpl_includeFile($fn){
+        _tpl_include($fn);
+    }
+}
