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

@ -86,7 +86,7 @@ class ForumManager {
$total = count($contacts);
$visible_forums = 10;
if(count($contacts)) {
if(dba::is_result($contacts)) {
$id = 0;