Changeset 29902

Timestamp:

Oct 6, 2014, 11:28:37 AM (10 years ago)

Author:

plg

Message:

merge r29901 from trunk to branch 2.7

bug 3156 fixed: avoid warning on PHP 5.2 for nl2br second parameter

File:

• branches/2.7/picture.php (modified) (1 diff)

branches/2.7/picture.php

@@ -138 +138 @@
 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');