From 397f239abbcd554fc8d0f7e9a761a9498ae2995d Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 5 Oct 2020 17:40:06 +0200 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Hypolite Petovan --- src/Content/Text/BBCode.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php index 1b0fa9c74..94b1c35d1 100644 --- a/src/Content/Text/BBCode.php +++ b/src/Content/Text/BBCode.php @@ -1222,14 +1222,11 @@ class BBCode public static function removeLinks(string $bbcode) { - $bbcode = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", ' ', $bbcode); $bbcode = preg_replace("/\[img\=(.*?)\](.*?)\[\/img\]/ism", ' $1 ', $bbcode); - $bbcode = preg_replace("/\[img\](.*?)\[\/img\]/ism", ' ', $bbcode); + $bbcode = preg_replace("/\[img.*?\[\/img\]/ism", ' ', $bbcode); - $bbcode = preg_replace('/([@!#])\[url\=(.*?)\](.*?)\[\/url\]/ism', '', $bbcode); - $bbcode = preg_replace("/\[url\](.*?)\[\/url\]/ism", ' ', $bbcode); $bbcode = preg_replace("/\[url=[^\[\]]*\](.*)\[\/url\]/Usi", ' $1 ', $bbcode); - $bbcode = preg_replace("/\[url\](.*?)\[\/url\]/ism", ' ', $bbcode); + $bbcode = preg_replace('/[@!#]?\[url.*?\[\/url\]/ism', '', $bbcode); return $bbcode; }