summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--inc/template.php12
1 files changed, 7 insertions, 5 deletions
diff --git a/inc/template.php b/inc/template.php
index 99ab8f35f..d5e4823dc 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1347,12 +1347,14 @@ function tpl_flush(){
* @author Anika Henke <anika@selfthinker.org>
*/
function tpl_getFavicon($abs=false) {
- if (file_exists(mediaFN('favicon.ico'))) {
- if($abs) return ml('favicon.ico', '', '', '', true);
- else return ml('favicon.ico');
+ if (file_exists(mediaFN('favicon.ico')))
+ return ml('favicon.ico', '', '', '', $abs);
+
+ if($abs) {
+ return DOKU_URL.substr(DOKU_TPL.'images/favicon.ico', strlen(DOKU_REL));
+ } else {
+ return DOKU_TPL.'images/favicon.ico';
}
- if($abs) return DOKU_URL.substr(DOKU_TPL.'images/favicon.ico', strlen(DOKU_REL));
- else return DOKU_TPL.'images/favicon.ico';
}