diff options
| author | Brion Vibber <brion@pobox.com> | 2010-08-13 10:51:00 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-08-13 12:23:28 -0700 |
| commit | f7b2bb09e66d3985ce6f524e6841e5f6a473afdc (patch) | |
| tree | 3c51a9f5159da2707b45fd69f31d28af841d7c79 | |
| parent | d06bdfa54bab19c04d4e4dd74801df57bcd5a19c (diff) | |
Suppress whinging during HTML parsing in profile page discovery for things that turn out to be XML feeds with funny namespaces.
| -rw-r--r-- | plugins/OStatus/lib/discoveryhints.php | 5 | ||||
| -rw-r--r-- | plugins/OStatus/lib/feeddiscovery.php | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/plugins/OStatus/lib/discoveryhints.php b/plugins/OStatus/lib/discoveryhints.php index 34c9be277..fa2ead732 100644 --- a/plugins/OStatus/lib/discoveryhints.php +++ b/plugins/OStatus/lib/discoveryhints.php @@ -114,9 +114,10 @@ class DiscoveryHints { 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->loadHTML($body); diff --git a/plugins/OStatus/lib/feeddiscovery.php b/plugins/OStatus/lib/feeddiscovery.php index a55399d7c..8a166a0be 100644 --- a/plugins/OStatus/lib/feeddiscovery.php +++ b/plugins/OStatus/lib/feeddiscovery.php @@ -196,8 +196,9 @@ class FeedDiscovery */ function discoverFromHTML($url, $body) { - // DOMDocument::loadHTML may throw warnings on unrecognized elements. - $old = error_reporting(error_reporting() & ~E_WARNING); + // DOMDocument::loadHTML may throw warnings on unrecognized elements, + // and notices on unrecognized namespaces. + $old = error_reporting(error_reporting() & ~(E_WARNING | E_NOTICE)); $dom = new DOMDocument(); $ok = $dom->loadHTML($body); error_reporting($old); |