Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x

1 files changed, 14 insertions, 0 deletions

diff --git a/plugins/OStatus/extlib/xml-feed-parser-bug-16416.patch b/plugins/OStatus/extlib/xml-feed-parser-bug-16416.patch
new file mode 100644
index 000000000..c53bd9737
--- /dev/null
+++ b/plugins/OStatus/extlib/xml-feed-parser-bug-16416.patch
@@ -0,0 +1,14 @@
+diff --git a/htdocs/lib/pear/XML/Feed/Parser/RSS2.php b/htdocs/lib/pear/XML/Feed/Parser/RSS2.php
+index c5d79d1..308a4ab 100644
+--- a/htdocs/lib/pear/XML/Feed/Parser/RSS2.php
++++ b/htdocs/lib/pear/XML/Feed/Parser/RSS2.php
+@@ -321,7 +321,8 @@ class XML_Feed_Parser_RSS2 extends XML_Feed_Parser_Type
+      */
+     function getLink($offset, $attribute = 'href', $params = array())
+     {
+-        $links = $this->model->getElementsByTagName('link');
++        $xPath = new DOMXPath($this->model);
++        $links = $xPath->query('//link');
+ 
+         if ($links->length <= $offset) {
+             return false;