diff options
| -rw-r--r-- | inc/template.php | 13 | ||||
| -rw-r--r-- | lib/tpl/default/main.php | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/inc/template.php b/inc/template.php index cb98c83d7..00bfde723 100644 --- a/inc/template.php +++ b/inc/template.php @@ -1359,5 +1359,18 @@ function tpl_flush(){ } +/** + * Use favicon.ico from data/media root directory if it exists, otherwise use + * the one in the template's image directory. + * + * @author Anika Henke <anika@selfthinker.org> + */ +function tpl_getFavicon() { + if (file_exists(mediaFN('favicon.ico'))) + return ml('favicon.ico'); + return DOKU_TPL.'images/favicon.ico'; +} + + //Setup VIM: ex: et ts=4 enc=utf-8 : diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php index d9231678b..754a6e482 100644 --- a/lib/tpl/default/main.php +++ b/lib/tpl/default/main.php @@ -29,7 +29,7 @@ if (!defined('DOKU_INC')) die(); <?php tpl_metaheaders()?> - <link rel="shortcut icon" href="<?php echo DOKU_TPL?>images/favicon.ico" /> + <link rel="shortcut icon" href="<?php echo tpl_getFavicon() ?>" /> <?php /*old includehook*/ @include(dirname(__FILE__).'/meta.html')?> </head> |