From 1f13e33de09eda0fecc978c1fdbf9393cc56165f Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 8 May 2011 14:16:19 +0100
Subject: [PATCH] made favicon always use direct link if used with ml()
---
inc/template.php | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/inc/template.php b/inc/template.php
index d5e4823dc..b9b3951ff 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1347,14 +1347,15 @@ function tpl_flush(){
* @author Anika Henke <anika@selfthinker.org>
*/
function tpl_getFavicon($abs=false) {
- if (file_exists(mediaFN('favicon.ico')))
- return ml('favicon.ico', '', '', '', $abs);
+ if (file_exists(mediaFN('favicon.ico'))) {
+ return ml('favicon.ico', '', true, '', $abs);
+ }
- if($abs) {
+ if($abs) {
return DOKU_URL.substr(DOKU_TPL.'images/favicon.ico', strlen(DOKU_REL));
- } else {
- return DOKU_TPL.'images/favicon.ico';
}
+
+ return DOKU_TPL.'images/favicon.ico';
}
--
GitLab