keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #625 from tobiasd/master

Browse source 
make sure conv_as->items is an array or don't proceed
This commit is contained in:
tobiasd 2013-02-23 23:27:21 -08:00
commit 521ccc38c6
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/ostatus_conversation.php
View file

@ -75,6 +75,9 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio
$conv_as = json_decode($conv_as); $conv_as = json_decode($conv_as);
$first_id = ""; $first_id = "";
if (!is_array($conv_as->items))
return;
$items = array_reverse($conv_as->items); $items = array_reverse($conv_as->items);
foreach ($items as $single_conv) { foreach ($items as $single_conv) {