Merge branch 'rewrites/is_filled_array_introduced' of git://github.com/Quix0r/friendica into Quix0r-rewrites/is_filled_array_introduced

Conflicts:
	boot.php
This commit is contained in:
Michael Vogel 2016-07-02 13:38:23 +02:00
commit 7d531afd00
10 changed files with 73 additions and 26 deletions

View file

@ -704,7 +704,7 @@ function network_content(&$a, $update = 0) {
$parents_str = '';
$date_offset = "";
if(count($r)) {
if(dba::is_result($r)) {
foreach($r as $rr)
if(! in_array($rr['item_id'],$parents_arr))
$parents_arr[] = $rr['item_id'];