diff options
| author | rvelices <rv-github@modusoptimus.com> | 2007-10-02 05:42:22 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2007-10-02 05:42:22 +0000 |
| commit | 530e3e6974f95be5a5cca823b33ec8f7562fbcf6 (patch) | |
| tree | 7eb1cb1f5b66c90c8e032b33833a2c1c331ee496 /include/functions_category.inc.php | |
| parent | 58977351dd282cd14b53bbf04494acbddc185900 (diff) | |
- merge r 2117 from trunk (render_category_description and render_category_literal_description events refactoring)
- fix admin multiview plugin
git-svn-id: http://piwigo.org/svn/branches/branch-1_7@2118 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include/functions_category.inc.php')
| -rw-r--r-- | include/functions_category.inc.php | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/include/functions_category.inc.php b/include/functions_category.inc.php index 113af6dd9..c598c30f5 100644 --- a/include/functions_category.inc.php +++ b/include/functions_category.inc.php @@ -156,12 +156,6 @@ SELECT * $cat[$k] = get_boolean( $cat[$k] ); } } - global $conf; - if ( !( $conf['allow_html_descriptions'] and - preg_match('/<(div|br|img|script).*>/i', $cat['comment']) ) ) - { - $cat['comment'] = nl2br(@$cat['comment']); - } $upper_ids = explode(',', $cat['uppercats']); if ( count($upper_ids)==1 ) @@ -445,7 +439,7 @@ function get_display_images_count($cat_nb_images, $cat_count_images, $cat_count_ $cat_count_images-= $cat_nb_images; $cat_nb_images = 0; } - + //at least one image direct or indirect $display_text.= l10n_dec('image_available', 'images_available', $cat_count_images); @@ -466,4 +460,4 @@ function get_display_images_count($cat_nb_images, $cat_count_images, $cat_count_ return $display_text; } -?> +?>
\ No newline at end of file |