Merge pull request #2453 from rabuzarus/1404_reworked_autocomplete

[friendica.git] / include / bbcode.php

diff --git a/include/bbcode.php b/include/bbcode.php
index c1156e3afe323c6c80d6cb22248b22e71ae9859f..8545b2ff8253c9b29c9b71d87b8003a383623e3b 100644 (file)
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -311,6 +311,9 @@ function tryoembed($match){
 
        $o = oembed_fetch_url($url);
 
+       if (!is_object($o))
+               return $match[0];
+
        if (isset($match[2]))
                $o->title = $match[2];