Merge https://github.com/friendica/friendica into pull

[friendica.git] / include / network.php

diff --git a/include/network.php b/include/network.php
index ec99d1e0dc12a0c0ec1f206187ae958782d60f91..a9ee3f0a54deece8d4624e337c8569a758a0a448 100644 (file)
--- a/include/network.php
+++ b/include/network.php
@@ -429,7 +429,12 @@ function lrdd($uri) {
        // don't try and parse raw xml as html
        if(! strstr($html,'<?xml')) {
                require_once('library/HTML5/Parser.php');
-               $dom = @HTML5_Parser::parse($html);
+
+               try {
+                       $dom = HTML5_Parser::parse($html);
+               } catch (DOMException $e) {
+                       logger('lrdd: parse error: ' . $e);
+               }
 
                if($dom) {
                        $items = $dom->getElementsByTagName('link');
@@ -727,7 +732,6 @@ function add_fcontact($arr,$update = false) {
                        dbesc($arr['notify']),
                        dbesc($arr['poll']),
                        dbesc($arr['confirm']),
-                       dbesc($arr['network']),
                        dbesc($arr['alias']),
                        dbesc($arr['pubkey']),
                        dbesc(datetime_convert()),
@@ -755,5 +759,6 @@ function add_fcontact($arr,$update = false) {
                        dbesc(datetime_convert())
                );
        }
+
        return $r;
 }