GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Suppress whinging during HTML parsing in profile page discovery for things that turn out to be XML feeds with funny namespaces.

Browse Source
This commit is contained in:
Brion Vibber 2010-08-13 10:51:00 -07:00
parent 6787b377c0
commit 115231f917
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/OStatus/lib/discoveryhints.php
View File

@ -114,9 +114,10 @@ class DiscoveryHints {
static function _hcard($body, $url) static function _hcard($body, $url)
{ {
// DOMDocument::loadHTML may throw warnings on unrecognized elements. // DOMDocument::loadHTML may throw warnings on unrecognized elements,
// and notices on unrecognized namespaces.
$old = error_reporting(error_reporting() & ~E_WARNING); $old = error_reporting(error_reporting() & ~(E_WARNING | E_NOTICE));
$doc = new DOMDocument(); $doc = new DOMDocument();
$doc->loadHTML($body); $doc->loadHTML($body);

5
plugins/OStatus/lib/feeddiscovery.php
View File

@ -196,8 +196,9 @@ class FeedDiscovery
*/ */
function discoverFromHTML($url, $body) function discoverFromHTML($url, $body)
{ {
// DOMDocument::loadHTML may throw warnings on unrecognized elements. // DOMDocument::loadHTML may throw warnings on unrecognized elements,
$old = error_reporting(error_reporting() & ~E_WARNING); // and notices on unrecognized namespaces.
$old = error_reporting(error_reporting() & ~(E_WARNING | E_NOTICE));
$dom = new DOMDocument(); $dom = new DOMDocument();
$ok = $dom->loadHTML($body); $ok = $dom->loadHTML($body);
error_reporting($old); error_reporting($old);