Fixes E_WARNING from foreach() because count() seem to return TRUE even when $r is...

[friendica.git] / include / ForumManager.php

diff --git a/include/ForumManager.php b/include/ForumManager.php
index 49417d1831564c0fbc0ce5e635213c0bc883449b..bbf881c9d037526cd8a74d1b05a25459698a13a3 100644 (file)
--- a/include/ForumManager.php
+++ b/include/ForumManager.php
@@ -86,7 +86,7 @@ class ForumManager {
                $total = count($contacts);
                $visible_forums = 10;
 
-               if(count($contacts)) {
+               if(is_filled_array($contacts)) {
 
                        $id = 0;
 
@@ -95,12 +95,12 @@ class ForumManager {
                                $selected = (($cid == $contact['id']) ? ' forum-selected' : '');
 
                                $entry = array(
-                                       'url' => z_root() . '/network?f=&cid=' . $contact['id'],
-                                       'external_url' => z_root() . '/redir/' . $contact['id'],
+                                       'url' => 'network?f=&cid=' . $contact['id'],
+                                       'external_url' => 'redir/' . $contact['id'],
                                        'name' => $contact['name'],
                                        'cid' => $contact['id'],
                                        'selected'      => $selected,
-                                       'micro' => proxy_url($contact['micro'], false, PROXY_SIZE_MICRO),
+                                       'micro' => App::remove_baseurl(proxy_url($contact['micro'], false, PROXY_SIZE_MICRO)),
                                        'id' => ++$id,
                                );
                                $entries[] = $entry;
@@ -187,4 +187,4 @@ class ForumManager {
                return $r;
        }
 
-}
\ No newline at end of file
+}