Merge remote branch 'upstream/master'

1 files changed, 6 insertions, 1 deletions

diff --git a/boot.php b/boot.php
index 0704c2305..1a6bf622c 100644
--- a/boot.php
+++ b/boot.php
@@ -4,7 +4,7 @@ set_time_limit(0);
 ini_set('pcre.backtrack_limit', 250000);
 
 
-define ( 'FRIENDIKA_VERSION',      '2.2.987' );
+define ( 'FRIENDIKA_VERSION',      '2.2.988' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1054      );
 
@@ -1508,6 +1508,8 @@ function lrdd($uri) {
 	logger('lrdd: host_meta: ' . $xml, LOGGER_DATA);
 
 	$h = parse_xml_string($xml);
+	if(! $h)
+		return array();
 
 	$arr = convert_xml_element_to_array($h);
 
@@ -1672,6 +1674,9 @@ function fetch_xrd_links($url) {
 
 	logger('fetch_xrd_links: ' . $xml, LOGGER_DATA);
 	$h = parse_xml_string($xml);
+	if(! $h)
+		return array();
+
 	$arr = convert_xml_element_to_array($h);
 
 	$links = array();