more error handling

diff --git a/include/conversation.php b/include/conversation.php
index a9fb807add3289067ed6725af2505b9df404e6c5..5a922b2b521619606e24da4df80d55be6510e8f5 100755 (executable)
--- 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 22157ff1889ce6ef4cebb8df3e09cce902ae7fba..9e1ed2091d5d2f5429846ceeb9c6c600c159c39e 100755 (executable)
--- 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();