mirror of
https://git.sekbaer.de/Friendica/friendica.git
synced 2025-06-16 20:05:14 +02:00
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:
commit
7d531afd00
10 changed files with 73 additions and 26 deletions
|
@ -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'];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue