From: Mischa POSLAWSKY <perl@shiar.org>
Date: Sat, 15 May 2021 20:18:54 +0000 (+0200)
Subject: widget/reply: emphasis formatting over sentences
X-Git-Tag: v5.3~4
X-Git-Url: http://git.shiar.nl/minimedit.git/commitdiff_plain/cc9044a1aa3f79cda743040573d49bc71fb7805f

widget/reply: emphasis formatting over sentences

Fix boundaries and contents besides simple words.
---

diff --git a/upload.inc.php b/upload.inc.php
index 86af604..0ee432b 100644
--- a/upload.inc.php
+++ b/upload.inc.php
@@ -58,8 +58,8 @@ function messagehtml($input)
 		"/\r\n?/" => "\n",        # unix newlines
 		"/  +\n/" => "<br />",    # trailing spaces for hard line break
 		"/\n/"    => "</p>\n<p>", # newlines start paragraphs
-		'/\b_(\w+)_\b/'   => '<em>$1</em>',         # italic
-		'/\b\*(\w+)\*\b/' => '<strong>$1</strong>', # bold
+		'/_(?<!\w_)(.+?)_(?!\w)/'      => '<em>$1</em>',         # italic
+		'/\*(?<!\w\*)(.+?)\*(?!\w)/'   => '<strong>$1</strong>', # bold
 	];
 	$html = preg_replace(array_keys($markup), array_values($markup), htmlspecialchars($input));
 	return "<p>$html</p>";