diff options
| author | Andrew Dolgov <[email protected]> | 2015-01-15 10:37:42 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2015-01-15 10:37:42 +0300 |
| commit | d87b710d84462f5aac607aa0f3fc75b28477890e (patch) | |
| tree | 528164514526c9413180baf3a18a21392bfe07e5 | |
| parent | b1bb951fb81d084429539c9d5b216dead56c9bd7 (diff) | |
| parent | 7871ed81b701bd18a58bd1442a59d88697b73e82 (diff) | |
Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
| -rw-r--r-- | classes/feeditem/rss.php | 2 | ||||
| -rw-r--r-- | plugins/import_export/init.php | 4 |
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); |