- improvement : screen admin/picture_modify rewritten. Presentation copied

  from admin/cat_modify : fieldsets regroup fields. Ability to synchronize
  metadata for the displayed item.

- bug 110 fixed : "return to element view from element edition fails
  depending on permissions". If a reachable (for the connected admin)
  category is available, a "jump to" link is displayed, by default, using
  the category given in URL.

- bug fixed : in mass_updates function, the first item of $fields['update']
  has not always 0 for id (as in any array).

- modification : get_keywords function understands spaces as separator,
  allow less than 3 chars keywords, allow quotes.

- new : ability to allow HTML in picture or category description (false by
  default)


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

2 files changed, 8 insertions, 3 deletions

diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index 99efedd0d..700fd68a5 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -265,4 +265,8 @@ $conf['guest_id'] = 2;
 // must update categories informations in screen [Admin > General >
 // Maintenance].
 $conf['allow_random_representative'] = false;
+
+// allow_html_descriptions : authorize administrators to use HTML in
+// category and element description.
+$conf['allow_html_descriptions'] = true;
 ?>
diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php
index 5c642fc30..dc5f8679c 100644
--- a/include/functions_html.inc.php
+++ b/include/functions_html.inc.php
@@ -259,8 +259,9 @@ function get_cat_display_name($cat_informations,
     }
     else
     {
-      $output.= '
-<a class="" href="'.add_session_id(PHPWG_ROOT_PATH.$url.$id).'">'.$name.'</a>';
+      $output.= '<a class=""';
+      $output.= ' href="'.add_session_id(PHPWG_ROOT_PATH.$url.$id).'">';
+      $output.= $name.'</a>';
     }
   }
   if ($replace_space)
@@ -455,6 +456,6 @@ function get_cat_display_name_from_id($cat_id,
                                       $replace_space = true)
 {
   $cat_info = get_cat_info($cat_id);
-  get_cat_display_name($cat_info['id'], $url, $replace_space);
+  return get_cat_display_name($cat_info['name'], $url, $replace_space);
 }
 ?>