Merge branch 'master' of https://github.com/Geeklog-Core/geeklog

Geeklog-Core · Jan 21, 2022 · 54322ee · 54322ee
2 parents 8f204e4 + a74c295
commit 54322ee
Show file tree

Hide file tree

Showing 8 changed files with 461 additions and 60 deletions.
diff --git a/public_html/lib-common.php b/public_html/lib-common.php
@@ -8965,14 +8965,15 @@ function COM_escHTML($str, $flags = ENT_QUOTES, $isDoubleEncode = true, $encodin
  */
 function COM_nl2br($string)
 {
-    if (!defined('XHTML')) {
-        define('XHTML', '');
-    }
-
-    $replace = '<br' . XHTML . '>';
-    $find = array("\r\n", "\n\r", "\r", "\n");
+    if (empty($string)) {
+        return $string;
+    } else {
+        if (!defined('XHTML')) {
+            define('XHTML', '');
+        }
 
-    return str_replace($find, $replace, $string);
+        return str_replace(["\r\n", "\n\r", "\r", "\n"], '<br' . XHTML . '>', $string);
+    }
 }
 
 /**

diff --git a/public_html/usersettings.php b/public_html/usersettings.php
@@ -345,7 +345,7 @@ function edituser()
         'about_value',
         GLText::getEditText($A['about'], $postMode, GLTEXT_LATEST_VERSION)
     );
-    $preferences->set_var('pgpkey_value', htmlspecialchars($A['pgpkey']));
+    $preferences->set_var('pgpkey_value', !empty($A['pgpkey']) ? htmlspecialchars($A['pgpkey']) : '');
     $preferences->set_var(array(
         'plaintext_selected' => (($postMode === 'plaintext') ? ' selected="selected"' : ''),
         'html_selected'      => (($postMode === 'html') ? ' selected="selected"' : ''),