summaryrefslogtreecommitdiff
path: root/inc/template.php
diff options
context:
space:
mode:
authorAnika Henke <anika@selfthinker.org>2011-05-08 14:16:19 +0100
committerAnika Henke <anika@selfthinker.org>2011-05-08 14:16:19 +0100
commit1f13e33de09eda0fecc978c1fdbf9393cc56165f (patch)
treec766ab64f3e9a0786df6bdf6c1e642219ed8e23f /inc/template.php
parent76b11d32af54e43ae219b4c463acdc22457f73f6 (diff)
downloadrpg-1f13e33de09eda0fecc978c1fdbf9393cc56165f.tar.gz
rpg-1f13e33de09eda0fecc978c1fdbf9393cc56165f.tar.bz2
made favicon always use direct link if used with ml()
Diffstat (limited to 'inc/template.php')
-rw-r--r--inc/template.php11
1 files 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';
}