diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2011-05-08 03:23:01 -0700 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2011-05-08 03:23:01 -0700 |
| commit | 76b11d32af54e43ae219b4c463acdc22457f73f6 (patch) | |
| tree | 18a461985b7e5cad8dac56c59addf141f0d0840e /inc/template.php | |
| parent | 65aa8490874917620bd9a9a773cd0fb7621afb41 (diff) | |
| parent | 0f7478632921287ff1f0c6afe6672830898dd71d (diff) | |
| download | rpg-76b11d32af54e43ae219b4c463acdc22457f73f6.tar.gz rpg-76b11d32af54e43ae219b4c463acdc22457f73f6.tar.bz2 | |
Merge pull request #44 from lupo49/master
Cosmetic changes in tpl_getFavicon()
Diffstat (limited to 'inc/template.php')
| -rw-r--r-- | inc/template.php | 12 |
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'; } |