Merged pull request #41 from lupo49/master.

de/eu - language updates / tpl_getfavicon()

2 files changed, 10 insertions, 4 deletions

diff --git a/inc/lang/eu/lang.php b/inc/lang/eu/lang.php
index 503b20b30..e49290e5e 100644
--- a/inc/lang/eu/lang.php
+++ b/inc/lang/eu/lang.php
@@ -157,6 +157,9 @@ $lang['yours']                 = 'Zure Bertsioa';
 $lang['diff']                  = 'egungo bertsioarekin dituen aldaketak aurkezten ditu';
 $lang['diff2']                 = 'Erakutsi desberdintasunak aukeratutako bertsioen artean';
 $lang['difflink']              = 'Estekatu konparaketa bista honetara';
+$lang['diff_type']             = 'Ikusi diferentziak:';
+$lang['diff_inline']           = 'Lerro tartean';
+$lang['diff_side']             = 'Ondoz ondo';
 $lang['line']                  = 'Marra';
 $lang['breadcrumb']            = 'Traza';
 $lang['youarehere']            = 'Hemen zaude';
diff --git a/inc/template.php b/inc/template.php
index 0f0fb92a0..61378bf92 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1346,10 +1346,13 @@ function tpl_flush(){
  *
  * @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';
+function tpl_getFavicon($abs=false) {
+    if (file_exists(mediaFN('favicon.ico'))) {
+        if($abs) return ml('favicon.ico', '', '', '', true);
+        else return ml('favicon.ico');
+    }
+    if($abs) return DOKU_URL.substr(DOKU_TPL.'images/favicon.ico', strlen(DOKU_REL));
+    else return DOKU_TPL.'images/favicon.ico';
 }