Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS

classes/feeditem/rss.php

@@ -51,7 +51,7 @@ class FeedItem_RSS extends FeedItem_Common {
 	}
 
 	function get_title() {
-		$title = $this->elem->getElementsByTagName("title")->item(0);
+		$title = $this->xpath->query("title", $this->elem)->item(0);
 
 		if ($title) {
 			return trim($title->nodeValue);

plugins/import_export/init.php

@@ -189,6 +189,8 @@ class Import_Export extends Plugin implements IHandler {
 		$num_processed = 0;
 		$num_feeds_created = 0;
 
+		libxml_disable_entity_loader(false);
+
 		$doc = @DOMDocument::load($filename);
 
 		if (!$doc) {
@@ -206,6 +208,8 @@ class Import_Export extends Plugin implements IHandler {
 				$doc = DOMDocument::loadXML($data);
 		}
 
+		libxml_disable_entity_loader(true);
+
 		if ($doc) {
 
 			$xpath = new DOMXpath($doc);