Merge pull request #4682 from MrPetovan/task/4681-nsfw-add-hashtag-only-hiding

[friendica.git] / src / Content / Text / BBCode.php

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index b7e4207199b01d94961e346c267ac5f55ac5e113..7d1c429765337e48d374f07c223eff9c18e7d0ed 100644 (file)
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -28,7 +28,6 @@ use Friendica\Util\Network;
 use Friendica\Util\ParseUrl;
 use League\HTMLToMarkdown\HtmlConverter;
 
-require_once "include/event.php";
 require_once "mod/proxy.php";
 
 class BBCode extends BaseObject
@@ -77,10 +76,12 @@ class BBCode extends BaseObject
 
                                        $picturedata = Image::getInfoFromURL($matches[1]);
 
-                                       if (($picturedata[0] >= 500) && ($picturedata[0] >= $picturedata[1])) {
-                                               $post["image"] = $matches[1];
-                                       } else {
-                                               $post["preview"] = $matches[1];
+                                       if ($picturedata) {
+                                               if (($picturedata[0] >= 500) && ($picturedata[0] >= $picturedata[1])) {
+                                                       $post["image"] = $matches[1];
+                                               } else {
+                                                       $post["preview"] = $matches[1];
+                                               }
                                        }
                                }
 
@@ -267,7 +268,7 @@ class BBCode extends BaseObject
                                                $post["text"] = str_replace($pictures[0][0], "", $body);
                                        } else {
                                                $imgdata = Image::getInfoFromURL($pictures[0][1]);
-                                               if (substr($imgdata["mime"], 0, 6) == "image/") {
+                                               if ($imgdata && substr($imgdata["mime"], 0, 6) == "image/") {
                                                        $post["type"] = "photo";
                                                        $post["image"] = $pictures[0][1];
                                                        $post["preview"] = $pictures[0][2];