Some fixes:

- avoids warning if no result is coming back
- brought back init variable before using it

Signed-off-by: Roland Haeder <roland@mxchange.org>

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 0162ecf1938bd6c2e4221c492be83cd13437b92d..4953a0c996401bed0693a62657d69abe9eac0680 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -732,6 +732,8 @@ function dfrn_request_content(&$a) {
                                intval($intro[0]['contact-id'])
                        );
 
+                       $auto_confirm = false;
+
                        if(dbm::is_result($r)) {
                                if(($r[0]['page-flags'] != PAGE_NORMAL) && ($r[0]['page-flags'] != PAGE_PRVGROUP))
                                        $auto_confirm = true;

diff --git a/mod/network.php b/mod/network.php
index 0222e33401ac12c34a71c5195af1dd4d6cf9a75f..c53a7eb90f58a2821b7cd99de3f5d79860ef2570 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -728,7 +728,9 @@ function network_content(&$a, $update = 0) {
                                        intval($parents),
                                        intval($max_comments + 1)
                                );
-                               $items = array_merge($items, $thread_items);
+       
+                               if (dbm::is_result($thread_items))
+                                       $items = array_merge($items, $thread_items);
                        }
                        $items = conv_sort($items,$ordering);
                } else {