aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlaurent.duretz <laurent.duretz@piwigo.org>2010-04-18 09:11:10 +0000
committerlaurent.duretz <laurent.duretz@piwigo.org>2010-04-18 09:11:10 +0000
commit43a30afea65e4466b0c91fdb4ad78e84f6c4e2cf (patch)
tree6da653775e651f7f0993f367aa463c623b29d80c
parent5e19ef98f6e16f0d6b17b02ea8dbef39fec29cc2 (diff)
Issue 1521 : correction for admin pages
git-svn-id: http://piwigo.org/svn/trunk@5917 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--include/functions_html.inc.php14
-rw-r--r--include/section_init.inc.php8
2 files changed, 13 insertions, 9 deletions
diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php
index 3cd429cea..6e97d0054 100644
--- a/include/functions_html.inc.php
+++ b/include/functions_html.inc.php
@@ -40,8 +40,10 @@ function get_cat_display_name($cat_informations,
{
global $conf;
- $output = '<a href="'.get_absolute_root_url().$conf['home_page'].'">'.l10n('Home').'</a>';
-
+ //$output = '<a href="'.get_absolute_root_url().$conf['home_page'].'">'.l10n('Home').'</a>';
+ $output = '';
+ $is_first = true;
+
foreach ($cat_informations as $cat)
{
is_array($cat) or trigger_error(
@@ -53,8 +55,12 @@ function get_cat_display_name($cat_informations,
$cat['name'],
'get_cat_display_name'
);
-
- $output.= $conf['level_separator'];
+
+ if (!$is_first)
+ {
+ $output.= $conf['level_separator'];
+ $is_first = false;
+ }
if ( !isset($url) )
{
diff --git a/include/section_init.inc.php b/include/section_init.inc.php
index f7fae1228..d4d8725dd 100644
--- a/include/section_init.inc.php
+++ b/include/section_init.inc.php
@@ -219,6 +219,8 @@ $forbidden = get_sql_condition_FandF(
// +-----------------------------------------------------------------------+
if ('categories' == $page['section'])
{
+ $page['title'] = '<a href="'.get_absolute_root_url().$conf['home_page'].'">'.l10n('Home').'</a>';
+
if (isset($page['category']))
{
$page = array_merge(
@@ -231,14 +233,10 @@ if ('categories' == $page['section'])
'main_page_category_description'
),
'title' =>
- get_cat_display_name($page['category']['upper_names'], '', false),
+ $page['title'].$conf['level_separator'].get_cat_display_name($page['category']['upper_names'], '', false),
)
);
}
- else
- {
- $page['title'] = '<a href="'.get_absolute_root_url().$conf['home_page'].'">'.l10n('Home').'</a>';
- }
if
(