Merge pull request #625 from tobiasd/master

make sure conv_as->items is an array or don't proceed
2013-02-23 23:27:21 -08:00 · 2013-02-23 23:27:21 -08:00 · 521ccc38c6
parent 69776fc54e c2b49f2588
commit 521ccc38c6
1 changed files with 3 additions and 0 deletions
--- 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) {