X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FContent%2FText%2FBBCode.php;h=2070d22d131d534b43f3040e6b6683f50f8d3ea1;hb=d609d70bd23a0665fa5dd138630a30731589e56d;hp=ae21d05e13bdfa8ed134410cbfbc8a229863de98;hpb=16f5dc92f88d1b73aad59f1b40e60f3cfe4bb672;p=friendica.git

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index ae21d05e13..2070d22d13 100644
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -273,8 +273,8 @@ class BBCode
 		// Get all linked images with alternative image description
 		if (preg_match_all("/\[img=(http[^\[\]]*)\]([^\[\]]*)\[\/img\]/Usi", $body, $pictures, PREG_SET_ORDER)) {
 			foreach ($pictures as $picture) {
-				if (Photo::isLocal($picture[1])) {
-					$post['images'][] = ['url' => str_replace('-1.', '-0.', $picture[1]), 'description' => $picture[2]];
+				if ($id = Photo::getIdForName($picture[1])) {
+					$post['images'][] = ['url' => str_replace('-1.', '-0.', $picture[1]), 'description' => $picture[2], 'id' => $id];
 				} else {
 					$post['remote_images'][] = ['url' => $picture[1], 'description' => $picture[2]];
 				}
@@ -286,8 +286,8 @@ class BBCode
 
 		if (preg_match_all("/\[img\]([^\[\]]*)\[\/img\]/Usi", $body, $pictures, PREG_SET_ORDER)) {
 			foreach ($pictures as $picture) {
-				if (Photo::isLocal($picture[1])) {
-					$post['images'][] = ['url' => str_replace('-1.', '-0.', $picture[1]), 'description' => ''];
+				if ($id = Photo::getIdForName($picture[1])) {
+					$post['images'][] = ['url' => str_replace('-1.', '-0.', $picture[1]), 'description' => '', 'id' => $id];
 				} else {
 					$post['remote_images'][] = ['url' => $picture[1], 'description' => ''];
 				}
@@ -2355,7 +2355,7 @@ class BBCode
 		DI::profiler()->startRecording('rendering');
 		$ret = [];
 
-		self::performWithEscapedTags($string, ['noparse', 'pre', 'code', 'img'], function ($string) use (&$ret) {
+		self::performWithEscapedTags($string, ['noparse', 'pre', 'code', 'img', 'attachment'], function ($string) use (&$ret) {
 			// Convert hashtag links to hashtags
 			$string = preg_replace('/#\[url\=([^\[\]]*)\](.*?)\[\/url\]/ism', '#$2 ', $string);
 
@@ -2599,7 +2599,7 @@ class BBCode
 		// Bypass attachment if parse url for a comment
 		if (!$tryAttachment) {
 			DI::profiler()->stopRecording();
-			return "\n" . '[url=' . $url . ']' . $siteinfo['title'] . '[/url]';
+			return "\n" . '[url=' . $url . ']' . ($siteinfo['title'] ?? $url) . '[/url]';
 		}
 
 		// Format it as BBCode attachment