Issue 1521 : correction for admin pages

git-svn-id: http://piwigo.org/svn/trunk@5917 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Apr 18, 2010 · 43a30af · 43a30af
1 parent 5e19ef9
commit 43a30af
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git 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
@@ -219,6 +219,8 @@
 // +-----------------------------------------------------------------------+
 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 @@
               '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
     (