aboutsummaryrefslogtreecommitdiffstats
path: root/include/functions_category.inc.php
diff options
context:
space:
mode:
Diffstat (limited to 'include/functions_category.inc.php')
-rw-r--r--include/functions_category.inc.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/functions_category.inc.php b/include/functions_category.inc.php
index 548e5fe35..b3abce892 100644
--- a/include/functions_category.inc.php
+++ b/include/functions_category.inc.php
@@ -160,7 +160,12 @@ SELECT '.implode(',', $infos).'
$cat[$info] = get_boolean( $cat[$info] );
}
}
- $cat['comment'] = nl2br($cat['comment']);
+ global $conf;
+ if ( !( $conf['allow_html_descriptions'] and
+ preg_match('/<(div|br|img).*>/i', $cat['comment']) ) )
+ {
+ $cat['comment'] = nl2br($cat['comment']);
+ }
$names = array();
$query = '