aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2013-04-18 13:18:17 +0000
committerplegall <plg@piwigo.org>2013-04-18 13:18:17 +0000
commitf81a7de10386018933a2bdee1e47eec33efec949 (patch)
tree7e17021de4d5689dc917b1ef54ac9311c398b87e
parent08ca141ecc69be61ad1d29df43c1d7df6a52c79d (diff)
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
-rw-r--r--include/section_init.inc.php17
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'];
}
}