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

do not create duplicate archived feeds on unsubscribe, file entries into already existing archive entry

This commit is contained in:
Andrew Dolgov 2013-03-30 21:45:24 +04:00
parent 749da11bbe
commit aa5ac2cd3a
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
classes/pref/feeds.php
View File

@ -1702,18 +1702,27 @@ class Pref_Feeds extends Handler_Protected {
/* prepare feed if necessary */ /* prepare feed if necessary */
$result = db_query($link, "SELECT feed_url FROM ttrss_feeds WHERE id = $id
AND owner_uid = $owner_uid");
$feed_url = db_escape_string($link, db_fetch_result($result, 0, "feed_url"));
$result = db_query($link, "SELECT id FROM ttrss_archived_feeds $result = db_query($link, "SELECT id FROM ttrss_archived_feeds
WHERE id = '$id'"); WHERE feed_url = '$feed_url' AND owner_uid = $owner_uid");
if (db_num_rows($result) == 0) { if (db_num_rows($result) == 0) {
db_query($link, "INSERT INTO ttrss_archived_feeds db_query($link, "INSERT INTO ttrss_archived_feeds
(id, owner_uid, title, feed_url, site_url) (id, owner_uid, title, feed_url, site_url)
SELECT id, owner_uid, title, feed_url, site_url from ttrss_feeds SELECT id, owner_uid, title, feed_url, site_url from ttrss_feeds
WHERE id = '$id'"); WHERE id = '$id'");
$archive_id = $id;
} else {
$archive_id = db_fetch_result($result, 0, "id");
} }
db_query($link, "UPDATE ttrss_user_entries SET feed_id = NULL, db_query($link, "UPDATE ttrss_user_entries SET feed_id = NULL,
orig_feed_id = '$id' WHERE feed_id = '$id' AND orig_feed_id = '$archive_id' WHERE feed_id = '$id' AND
marked = true AND owner_uid = $owner_uid"); marked = true AND owner_uid = $owner_uid");
/* Remove access key for the feed */ /* Remove access key for the feed */