Merge remote-tracking branch 'upstream/develop' into 1601-dfrn

This commit is contained in:
Michael Vogel 2016-01-24 18:21:09 +01:00
commit a2d025232b

View file

@ -42,6 +42,9 @@ function get_forumlist($uid, $showhidden = true, $lastitem, $showprivate = false
intval($uid) intval($uid)
); );
if (!$contacts)
return($forumlist);
foreach($contacts as $contact) { foreach($contacts as $contact) {
$forumlist[] = array( $forumlist[] = array(
'url' => $contact['url'], 'url' => $contact['url'],