aboutsummaryrefslogtreecommitdiffstats
path: root/include/functions_category.inc.php
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2007-10-02 05:38:54 +0000
committerrvelices <rv-github@modusoptimus.com>2007-10-02 05:38:54 +0000
commit2889cbc4eb06ce32caf3d5f8d592120830c4b676 (patch)
treed286d36b599997942997b859e0652648acbe9d49 /include/functions_category.inc.php
parent00d39fe8ba9c559a1208ca135cb7203b37ba68ce (diff)
- render_category_description and render_category_literal_description events refactoring
git-svn-id: http://piwigo.org/svn/trunk@2117 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/functions_category.inc.php10
1 files changed, 2 insertions, 8 deletions
diff --git a/include/functions_category.inc.php b/include/functions_category.inc.php
index c23c4a395..a0a42135e 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 )
@@ -448,7 +442,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);
@@ -469,4 +463,4 @@ function get_display_images_count($cat_nb_images, $cat_count_images, $cat_count_
return $display_text;
}
-?>
+?> \ No newline at end of file