merge r22282 from branch 2.5 to trunk

bug 2891 fixed: pure root_url on Home link in breadcrumb


git-svn-id: http://piwigo.org/svn/trunk@22283 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 5 insertions, 12 deletions

diff --git a/include/section_init.inc.php b/include/section_init.inc.php
index 3d451b45a..c71c44780 100644
--- a/include/section_init.inc.php
+++ b/include/section_init.inc.php
@@ -570,21 +570,14 @@ if (isset($page['chronology_field']))
 // title update
 if (isset($page['title']))
 {
+  $page['section_title'] = '<a href="'.get_gallery_home_url().'">'.l10n('Home').'</a>';
   if (!empty($page['title']))
-	{
-    $page['section_title'] = '<a href="'.get_gallery_home_url().'">'.l10n('Home').'</a>'.$conf['level_separator'].$page['title'];
-	}
+  {
+    $page['section_title'] .= $conf['level_separator'].$page['title'];
+  }
   else
   {
-    if ('picture'==script_basename())
-    {
-      $used_link = duplicate_index_url(array('start'=>0), array('flat'));
-    }
-    else
-    {
-      $used_link = get_gallery_home_url();
-    }
-    $page['section_title'] = $page['title'] = '<a href="'.$used_link.'">'.l10n('Home').'</a>';
+    $page['title'] = $page['section_title'];
   }
 }