From 95c82885588ab37756a511f5105fc70e32bab649 Mon Sep 17 00:00:00 2001
From: ghost <noreply@localhost>
Date: Tue, 4 Jan 2022 06:51:46 +0200
Subject: [PATCH] fix markdown regex replacement

---
 src/system/helper/format.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/system/helper/format.php b/src/system/helper/format.php
index 1248637..890e948 100644
--- a/src/system/helper/format.php
+++ b/src/system/helper/format.php
@@ -48,11 +48,11 @@ class Format {
   // Profile
   public static function bio(string $string) {
 
-    $string = preg_replace("|\*([\S]+)\*|i", "<b>$1</b>", $string);
-    $string = preg_replace("|\~([\S]+)\~|i", "<i>$1</i>", $string);
-    $string = preg_replace("|\_([\S]+)\_|i", "<u>$1</u>", $string);
-    $string = preg_replace("|\-([\S]+)\-|i", "<s>$1</s>", $string);
-    $string = preg_replace("|\`([\S]+)\`|i", "<samp>$1</samp>", $string);
+    $string = preg_replace("|([\s])\*([\S]+)\*([\s]?)|i", "$1<b>$2</b>$3", $string);
+    $string = preg_replace("|([\s])\~([\S]+)\~([\s]?)|i", "$1<i>$2</i>$3", $string);
+    $string = preg_replace("|([\s])\_([\S]+)\_([\s]?)|i", "$1<u>$2</u>$3", $string);
+    $string = preg_replace("|([\s])\-([\S]+)\-([\s]?)|i", "$1<s>$2</s>$3", $string);
+    $string = preg_replace("|([\s])\`([\S]+)\`([\s]?)|i", "$1<samp>$2</samp>$3", $string);
 
     $string = preg_replace("|@([a-zA-Z0-9_]+)|i", "<a href=\"people/$1\">@$1</a>", $string);
     $string = preg_replace("|((https?://)+([\d\w\.-]+\.[\w\.]{2,6})[^\s\]\[\<\>]*/?)|i", "<a href=\"$1\" target=\"_blank\">$3</a>", $string);
@@ -68,11 +68,11 @@ class Format {
     $string = html_entity_decode($string, ENT_QUOTES, 'UTF-8');
     $string = htmlentities($string, ENT_QUOTES, 'UTF-8');
 
-    $string = preg_replace("|\*([\S]+)\*|i", "<b>$1</b>", $string);
-    $string = preg_replace("|\~([\S]+)\~|i", "<i>$1</i>", $string);
-    $string = preg_replace("|\_([\S]+)\_|i", "<u>$1</u>", $string);
-    $string = preg_replace("|\-([\S]+)\-|i", "<s>$1</s>", $string);
-    $string = preg_replace("|\`([\S]+)\`|i", "<samp>$1</samp>", $string);
+    $string = preg_replace("|([\s])\*([\S]+)\*([\s]?)|i", "$1<b>$2</b>$3", $string);
+    $string = preg_replace("|([\s])\~([\S]+)\~([\s]?)|i", "$1<i>$2</i>$3", $string);
+    $string = preg_replace("|([\s])\_([\S]+)\_([\s]?)|i", "$1<u>$2</u>$3", $string);
+    $string = preg_replace("|([\s])\-([\S]+)\-([\s]?)|i", "$1<s>$2</s>$3", $string);
+    $string = preg_replace("|([\s])\`([\S]+)\`([\s]?)|i", "$1<samp>$2</samp>$3", $string);
 
     $string = preg_replace("|@([a-zA-Z0-9_]+)|i", "<a href=\"people/$1\">@$1</a>", $string);
     $string = preg_replace("|((https?://)+([\d\w\.-]+\.[\w\.]{2,6})[^\s\]\[\<\>]*/?)|i", "<a href=\"$1\" target=\"_blank\">$3</a>", $string);