From a7e5f74cc2ce69292dcbc773dd8a297832100cd5 Mon Sep 17 00:00:00 2001 From: lupo49 Date: Tue, 26 Apr 2011 21:49:33 +0200 Subject: allow tpl_getFavicon() returning the absolute path to the icon file --- inc/template.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'inc') 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 */ -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'; } -- cgit v1.2.3 From 8e702eb4879af9cdecf511373758668768c47a5f Mon Sep 17 00:00:00 2001 From: Matthias Schulte Date: Wed, 27 Apr 2011 11:30:56 +0200 Subject: eu: language updates --- inc/lang/eu/lang.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'inc') 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'; -- cgit v1.2.3