aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xinclude/conversation.php2
-rwxr-xr-xinclude/network.php3
2 files changed, 4 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php
index a9fb807ad..5a922b2b5 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 22157ff18..9e1ed2091 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();