From c4017d2a8a55a7424f77067563246d9458f7e94e Mon Sep 17 00:00:00 2001 From: plegall Date: Mon, 6 Oct 2014 09:27:19 +0000 Subject: bug 3156 fixed: avoid warning on PHP 5.2 for nl2br second parameter git-svn-id: http://piwigo.org/svn/trunk@29901 68402e56-0260-453c-a942-63ccdbb3a9ee --- picture.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/picture.php b/picture.php index a0eadf3e8..94c2b3ea3 100644 --- a/picture.php +++ b/picture.php @@ -137,7 +137,17 @@ if ( isset($_GET['metadata']) ) // add default event handler for rendering element content add_event_handler('render_element_content', 'default_picture_content'); // add default event handler for rendering element description -add_event_handler('render_element_description', 'nl2br'); +add_event_handler('render_element_description', 'pwg_nl2br'); + +/** + * pwg_nl2br is useful for PHP 5.2 which doesn't accept more than 1 + * parameter on nl2br() (and anyway the second parameter of nl2br does not + * match what Piwigo gives. + */ +function pwg_nl2br($string) +{ + return nl2br($string); +} trigger_notify('loc_begin_picture'); -- cgit v1.2.3