valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Andrew Dolgov 2015-01-15 10:37:42 +03:00
parent b1bb951fb8 7871ed81b7
commit d87b710d84
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/feeditem/rss.php
View File

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

4
plugins/import_export/init.php
View File

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