Merge branch 'master' of https://github.com/friendica/friendica

diff --git a/include/ostatus_conversation.php b/include/ostatus_conversation.php
index cdaf80d76b1eeedcc990f373fa617ed116c1e042..cecbb0496421e6195fbc4fdd37263628455d4c8d 100644 (file)
--- a/include/ostatus_conversation.php
+++ b/include/ostatus_conversation.php
@@ -75,6 +75,9 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio
                $conv_as = json_decode($conv_as);
 
                $first_id = "";
+
+                if (!is_array($conv_as->items))
+                    return;
                $items = array_reverse($conv_as->items);
 
                foreach ($items as $single_conv) {