summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2007-11-17 07:30:11 +0100
committerAndrew Dolgov <[email protected]>2007-11-17 07:30:11 +0100
commiteb8b5c263eb8ef9e797df8b6a30883da9f9abc6d (patch)
tree081b4f8af010b9d685d44dee417484a2cd7049d0 /modules
parente89addd9d11079a81da2ddfa56fdf31c1fd21441 (diff)
fix bug in OPML importing
Diffstat (limited to 'modules')
-rw-r--r--modules/opml_domdoc.php5
-rw-r--r--modules/opml_domxml.php4
2 files changed, 9 insertions, 0 deletions
diff --git a/modules/opml_domdoc.php b/modules/opml_domdoc.php
index bd10284b2..98eba69fa 100644
--- a/modules/opml_domdoc.php
+++ b/modules/opml_domdoc.php
@@ -63,12 +63,16 @@
if ($parent_node && $parent_node->nodeName == "outline") {
$element_category = $parent_node->attributes->getNamedItem('title')->nodeValue;
+ if (!$element_category) $element_category = $parent_node->attributes->getNamedItem('text')->nodeValue;
+
} else {
$element_category = '';
}
if ($element_category) {
+ $element_category = db_escape_string($element_category);
+
$result = db_query($link, "SELECT id FROM
ttrss_feed_categories WHERE title = '$element_category' AND
owner_uid = '$owner_uid' LIMIT 1");
@@ -102,6 +106,7 @@
}
+ //print $add_query;
db_query($link, $add_query);
print "<td><b>".__('Done.')."</b></td>";
diff --git a/modules/opml_domxml.php b/modules/opml_domxml.php
index 8de842c51..54ec76b90 100644
--- a/modules/opml_domxml.php
+++ b/modules/opml_domxml.php
@@ -66,12 +66,16 @@
if ($parent_node && $parent_node->node_name() == "outline") {
$element_category = $parent_node->get_attribute('title');
+ if (!$element_category) $element_category = $parent_node->get_attribute('text');
+
} else {
$element_category = '';
}
if ($element_category) {
+ $element_category = db_escape_string($element_category);
+
$result = db_query($link, "SELECT id FROM
ttrss_feed_categories WHERE title = '$element_category' AND
owner_uid = '$owner_uid' LIMIT 1");