Merge branch '2019.01-rc' into bug/6334-escape-get-app

2019-01-06 16:38:48 -05:00
parent b3f8a24819 4bf2701912
commit e447375cdd
27 changed files with 136 additions and 72 deletions
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -1228,7 +1228,7 @@ class OStatus
 	{
 		$siteinfo = BBCode::getAttachedData($body);

-		if (($siteinfo["type"] == "photo")) {
+		if (($siteinfo["type"] == "photo") && (!empty($siteinfo["preview"]) || !empty($siteinfo["image"]))) {
 			if (isset($siteinfo["preview"])) {
 				$preview = $siteinfo["preview"];
 			} else {