From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Thu, 4 Jun 2020 02:02:01 +0000 (-0400)
Subject: Move share content conversion before link handling in Text\BBCode::convert
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=010ec99b35c2bee8f23060e96c2af3ba5849cf84;p=friendica.git

Move share content conversion before link handling in Text\BBCode::convert
---

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 67dbe3b19a..ac869d0d87 100644
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -1765,6 +1765,15 @@ class BBCode
 				$text);
 		}
 
+		// Shared content conversion
+		// Notice: may create [bookmark] tags so this must be ran before the link handling
+		$text = self::convertShare(
+			$text,
+			function (array $attributes, array $author_contact, $content, $is_quote_share) use ($simple_html) {
+				return self::convertShareCallback($attributes, $author_contact, $content, $is_quote_share, $simple_html);
+			}
+		);
+
 		// Bookmarks in red - will be converted to bookmarks in friendica
 		$text = preg_replace("/#\^\[url\](.*?)\[\/url\]/ism", '[bookmark=$1]$1[/bookmark]', $text);
 		$text = preg_replace("/#\^\[url\=(.*?)\](.*?)\[\/url\]/ism", '[bookmark=$1]$2[/bookmark]', $text);
@@ -1883,14 +1892,6 @@ class BBCode
 		$regex = '#<([^>]*?)(href)="(?!' . implode('|', $allowed_link_protocols) . ')(.*?)"(.*?)>#ism';
 		$text = preg_replace($regex, '<$1$2="javascript:void(0)"$4 data-original-href="$3" class="invalid-href" title="' . DI::l10n()->t('Invalid link protocol') . '">', $text);
 
-		// Shared content
-		$text = self::convertShare(
-			$text,
-			function (array $attributes, array $author_contact, $content, $is_quote_share) use ($simple_html) {
-				return self::convertShareCallback($attributes, $author_contact, $content, $is_quote_share, $simple_html);
-			}
-		);
-
 		if ($saved_image) {
 			$text = self::interpolateSavedImagesIntoItemBody($text, $saved_image);
 		}
diff --git a/tests/src/Content/Text/BBCodeTest.php b/tests/src/Content/Text/BBCodeTest.php
index 35dff87d9f..28db30567d 100644
--- a/tests/src/Content/Text/BBCodeTest.php
+++ b/tests/src/Content/Text/BBCodeTest.php
@@ -236,7 +236,7 @@ class BBCodeTest extends MockedTest
 			'bug-7808-code-amp' => [
 				'expectedHtml' => '<code>&amp;</code>',
 				'text' => '[code]&[/code]',
-			]
+			],
 		];
 	}