Merge branch 'master' into patch-1

Conflicts:
	locale/de_DE/LC_MESSAGES/messages.po

1 files changed, 8 insertions, 0 deletions

diff --git a/classes/feeditem/rss.php b/classes/feeditem/rss.php
index c9a7467cd..27a364b81 100644
--- a/classes/feeditem/rss.php
+++ b/classes/feeditem/rss.php
@@ -51,6 +51,14 @@ class FeedItem_RSS extends FeedItem_Common {
 	}
 
 	function get_title() {
+		$title = $this->xpath->query("title", $this->elem)->item(0);
+
+		if ($title) {
+			return trim($title->nodeValue);
+		}
+
+		// if the document has a default namespace then querying for
+		// title would fail because of reasons so let's try the old way
 		$title = $this->elem->getElementsByTagName("title")->item(0);
 
 		if ($title) {