summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--classes/feeditem/rss.php2
-rw-r--r--plugins/import_export/init.php4
2 files changed, 5 insertions, 1 deletions
diff --git a/classes/feeditem/rss.php b/classes/feeditem/rss.php
index c9a7467cd..7b4c4fb0c 100644
--- a/classes/feeditem/rss.php
+++ b/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);
diff --git a/plugins/import_export/init.php b/plugins/import_export/init.php
index d185210ee..e61b62b67 100644
--- a/plugins/import_export/init.php
+++ b/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);