From a37f1fbae1309c44531f36e0109b1f2bfecf2539 Mon Sep 17 00:00:00 2001
From: "laurent.duretz" <laurent.duretz@piwigo.org>
Date: Mon, 29 Mar 2010 17:05:38 +0000
Subject: Issue 1521 : picture.tpl updated to avoid double home link,
 picture.php updated because tpl update, functions_html.inc.php updated to
 work with question_mark_in_urls = false

git-svn-id: http://piwigo.org/svn/trunk@5451 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 include/functions_html.inc.php      | 2 +-
 picture.php                         | 1 -
 themes/default/template/picture.tpl | 3 +--
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php
index 440d028c7..1cabb3acd 100644
--- a/include/functions_html.inc.php
+++ b/include/functions_html.inc.php
@@ -40,7 +40,7 @@ function get_cat_display_name($cat_informations,
 {
   global $conf;
 
-  $output = '<a href="'.PHPWG_ROOT_PATH.$conf['home_page'].'">'.l10n('Home').'</a>';
+  $output = '<a href="'.get_absolute_root_url().$conf['home_page'].'">'.l10n('Home').'</a>';
 
   foreach ($cat_informations as $cat)
   {
diff --git a/picture.php b/picture.php
index 6c16c713d..8aa5e9ffb 100644
--- a/picture.php
+++ b/picture.php
@@ -740,7 +740,6 @@ $template->assign(
 
     'LEVEL_SEPARATOR' => $conf['level_separator'],
 
-    'U_HOME' => make_index_url(),
     'U_UP' => $url_up,
     'DISPLAY_NAV_BUTTONS' => $conf['picture_navigation_icons'],
     'DISPLAY_NAV_THUMB' => $conf['picture_navigation_thumb']
diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl
index b1378132e..1676d2eaa 100644
--- a/themes/default/template/picture.tpl
+++ b/themes/default/template/picture.tpl
@@ -28,8 +28,7 @@
 
 <div id="imageHeaderBar">
   <div class="browsePath">
-    <a href="{$U_HOME}" rel="Home">{'Home'|@translate}</a>
-    {if !$IS_HOME}{$LEVEL_SEPARATOR}{$SECTION_TITLE}{/if}
+    {$SECTION_TITLE}
     {$LEVEL_SEPARATOR}{$current.TITLE}
   </div>
   <div class="imageNumber">{$PHOTO}</div>
-- 
cgit v1.2.3