diff options
author | Evan Prodromou <evan@status.net> | 2010-08-13 14:35:49 -0700 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-08-13 14:35:49 -0700 |
commit | 926c77246bb168097b3f937b5cc22ee9721b83c9 (patch) | |
tree | dea05edb30a9e6a1e7971727ea42c7214c06c808 /plugins/OStatus/lib | |
parent | 029aa0c61c9942c0688fd3dc9aa2893311543db1 (diff) | |
parent | 61ab21b711c3248c72c8336f481e8aa3d432c997 (diff) |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
plugins/OStatus/classes/Ostatus_profile.php
Diffstat (limited to 'plugins/OStatus/lib')
-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); |