From: Andrew Dolgov Date: Tue, 4 Mar 2008 06:37:19 +0000 (+0100) Subject: opml import: only check feed_url for duplicates X-Git-Tag: 1.2.21~9 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=f0053c6a47637d026dd5c4cc63d37c1c87d934df;p=tt-rss.git opml import: only check feed_url for duplicates --- diff --git a/modules/opml_domdoc.php b/modules/opml_domdoc.php index 1c0404c3..fcad76ed 100644 --- a/modules/opml_domdoc.php +++ b/modules/opml_domdoc.php @@ -93,7 +93,7 @@ } $result = db_query($link, "SELECT id FROM ttrss_feeds WHERE - (title = '$feed_title' OR feed_url = '$feed_url') + feed_url = '$feed_url' AND owner_uid = '$owner_uid'"); print "$feed_title diff --git a/modules/opml_domxml.php b/modules/opml_domxml.php index 5b1e4067..6a2e537a 100644 --- a/modules/opml_domxml.php +++ b/modules/opml_domxml.php @@ -96,7 +96,7 @@ } $result = db_query($link, "SELECT id FROM ttrss_feeds WHERE - (title = '$feed_title' OR feed_url = '$feed_url') + feed_url = '$feed_url AND owner_uid = '$owner_uid'"); print "$feed_title