From a21fd4b9fa168f867852150b109fcd7da2e59996 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 7 Nov 2010 13:15:33 +0000 Subject: [PATCH] made favicon.ico more flexible (use from data/media only if it exists, otherwise from tpl) --- images/favicon.ico | Bin 0 -> 7406 bytes main.php | 2 +- tpl_functions.php | 14 ++++++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 images/favicon.ico diff --git a/images/favicon.ico b/images/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..8b9616abb857310e4eb55c3ae1e2838516c568d8 GIT binary patch literal 7406 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 <?php tpl_pagetitle() ?> [<?php echo strip_tags($conf['title']) ?>] - + diff --git a/tpl_functions.php b/tpl_functions.php index 0dfee95..d258ed3 100644 --- a/tpl_functions.php +++ b/tpl_functions.php @@ -4,6 +4,8 @@ * * This file provides template specific custom functions that are * not provided by the DokuWiki core. + * It is common practice to start each function with an underscore + * to make sure it won't interfere with future core functions. */ // must be run from within DokuWiki @@ -64,3 +66,15 @@ function _tpl_userpage($userNS='user',$link=0,$wrapper=false) { if ($wrapper) echo ""; } + +/** + * Use favicon.ico from data/media root directory if it exists, otherwise use + * the one in the template's image directory. + * + * @author Anika Henke + */ +function _tpl_getFavicon() { + if (file_exists(mediaFN('favicon.ico'))) + return ml('favicon.ico'); + return DOKU_TPL.'images/favicon.ico'; +}