mirror of
https://tt-rss.org/git/tt-rss.git
synced 2024-06-30 12:30:52 +02:00
fix bug in OPML importing
This commit is contained in:
parent
e89addd9d1
commit
eb8b5c263e
|
@ -63,12 +63,16 @@
|
||||||
|
|
||||||
if ($parent_node && $parent_node->nodeName == "outline") {
|
if ($parent_node && $parent_node->nodeName == "outline") {
|
||||||
$element_category = $parent_node->attributes->getNamedItem('title')->nodeValue;
|
$element_category = $parent_node->attributes->getNamedItem('title')->nodeValue;
|
||||||
|
if (!$element_category) $element_category = $parent_node->attributes->getNamedItem('text')->nodeValue;
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
$element_category = '';
|
$element_category = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($element_category) {
|
if ($element_category) {
|
||||||
|
|
||||||
|
$element_category = db_escape_string($element_category);
|
||||||
|
|
||||||
$result = db_query($link, "SELECT id FROM
|
$result = db_query($link, "SELECT id FROM
|
||||||
ttrss_feed_categories WHERE title = '$element_category' AND
|
ttrss_feed_categories WHERE title = '$element_category' AND
|
||||||
owner_uid = '$owner_uid' LIMIT 1");
|
owner_uid = '$owner_uid' LIMIT 1");
|
||||||
|
@ -102,6 +106,7 @@
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//print $add_query;
|
||||||
db_query($link, $add_query);
|
db_query($link, $add_query);
|
||||||
|
|
||||||
print "<td><b>".__('Done.')."</b></td>";
|
print "<td><b>".__('Done.')."</b></td>";
|
||||||
|
|
|
@ -66,12 +66,16 @@
|
||||||
|
|
||||||
if ($parent_node && $parent_node->node_name() == "outline") {
|
if ($parent_node && $parent_node->node_name() == "outline") {
|
||||||
$element_category = $parent_node->get_attribute('title');
|
$element_category = $parent_node->get_attribute('title');
|
||||||
|
if (!$element_category) $element_category = $parent_node->get_attribute('text');
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
$element_category = '';
|
$element_category = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($element_category) {
|
if ($element_category) {
|
||||||
|
|
||||||
|
$element_category = db_escape_string($element_category);
|
||||||
|
|
||||||
$result = db_query($link, "SELECT id FROM
|
$result = db_query($link, "SELECT id FROM
|
||||||
ttrss_feed_categories WHERE title = '$element_category' AND
|
ttrss_feed_categories WHERE title = '$element_category' AND
|
||||||
owner_uid = '$owner_uid' LIMIT 1");
|
owner_uid = '$owner_uid' LIMIT 1");
|
||||||
|
|
Loading…
Reference in New Issue
Block a user