From fc5bc47bc3440f521f251b6f03d907774ba46a96 Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Wed, 18 Dec 2024 12:29:31 +0100
Subject: [PATCH] fixes #1960 custom pwg_nl2br to avoid warning on PHP 8.1+

---
 include/common.inc.php         |  2 +-
 include/functions_html.inc.php | 15 +++++++++++++++
 picture.php                    | 10 ----------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/include/common.inc.php b/include/common.inc.php
index 37ce01220..da23934ef 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -327,7 +327,7 @@ if (isset($conf['header_notes']))
 add_event_handler('render_category_literal_description', 'render_category_literal_description');
 if ( !$conf['allow_html_descriptions'] )
 {
-  add_event_handler('render_category_description', 'nl2br');
+  add_event_handler('render_category_description', 'pwg_nl2br');
 }
 add_event_handler('render_comment_content', 'render_comment_content');
 add_event_handler('render_comment_author', 'strip_tags');
diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php
index 75f324537..1f4649118 100644
--- a/include/functions_html.inc.php
+++ b/include/functions_html.inc.php
@@ -710,4 +710,19 @@ function flush_page_messages()
   }
 }
 
+/**
+ * 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)
+{
+  if (empty($string))
+  {
+    return $string;
+  }
+
+  return nl2br($string);
+}
+
 ?>
diff --git a/picture.php b/picture.php
index c8378de4b..d10c70509 100644
--- a/picture.php
+++ b/picture.php
@@ -124,16 +124,6 @@ add_event_handler('render_element_content', 'default_picture_content');
 // add default event handler for rendering element description
 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');
 
 // this is the default handler that generates the display for the element