diff options
| author | rvelices <rv-github@modusoptimus.com> | 2009-02-05 03:04:27 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2009-02-05 03:04:27 +0000 |
| commit | b019ad9b5556b96342aa4c271143219261432229 (patch) | |
| tree | 7c917eca8d78af02fa915909efa8fec0039b7aee /include/common.inc.php | |
| parent | a44e905d0ba68c995ebe066792b9b348c45599cc (diff) | |
merge r 3126 from trunk
- embellish_url compacts now ..
- some trigger improvements (render_category_description)
- improved perf of duplicate_xxx_url ( rewrote func params_for_duplication and remove some vars from $page )
git-svn-id: http://piwigo.org/svn/branches/2.0@3127 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include/common.inc.php')
| -rw-r--r-- | include/common.inc.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/common.inc.php b/include/common.inc.php index e08e74afa..db50f31f2 100644 --- a/include/common.inc.php +++ b/include/common.inc.php @@ -233,7 +233,10 @@ if (isset($conf['header_notes'])) // default event handlers add_event_handler('render_category_literal_description', 'render_category_literal_description'); -add_event_handler('render_category_description', 'render_category_description'); +if ( !$conf['allow_html_descriptions'] ) +{ + add_event_handler('render_category_description', 'nl2br'); +} add_event_handler('render_comment_content', 'htmlspecialchars'); add_event_handler('render_comment_content', 'parse_comment_content'); add_event_handler('render_comment_author', 'strip_tags'); |