From: friendica <info@friendica.com>
Date: Sun, 1 Apr 2012 00:44:34 +0000 (-0700)
Subject: more error handling
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e6fd6bfd89ada9b5aeea8fcac1614546deba85aa;p=friendica.git

more error handling
---

diff --git a/include/conversation.php b/include/conversation.php
index a9fb807add..5a922b2b52 100755
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -250,7 +250,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 	$threads = array();
 	$threadsid = -1;
 	
-	if(count($items)) {
+	if($items && count($items)) {
 
 		if($mode === 'network-new' || $mode === 'search' || $mode === 'community') {
 
diff --git a/include/network.php b/include/network.php
index 22157ff188..9e1ed2091d 100755
--- a/include/network.php
+++ b/include/network.php
@@ -364,6 +364,9 @@ function lrdd($uri, $debug = false) {
 
 	logger('lrdd: host_meta: ' . $xml, LOGGER_DATA);
 
+	if(! stristr($xml,'<xrd'))
+		return array();
+
 	$h = parse_xml_string($xml);
 	if(! $h)
 		return array();