]> git.wh0rd.org - tt-rss.git/commitdiff
do not rely on feed_id when adding archived feed while unsubscribing
authorAndrew Dolgov <fox@madoka.volgo-balt.ru>
Mon, 8 Apr 2013 09:58:48 +0000 (13:58 +0400)
committerAndrew Dolgov <fox@madoka.volgo-balt.ru>
Mon, 8 Apr 2013 09:58:48 +0000 (13:58 +0400)
classes/pref/feeds.php

index 68535562f21debf43a88d238e54860a035a13550..469ca1111c628d45c8fcbf9a031d6767ae1de7e0 100644 (file)
@@ -1712,12 +1712,15 @@ class Pref_Feeds extends Handler_Protected {
                                WHERE feed_url = '$feed_url' AND owner_uid = $owner_uid");
 
                        if (db_num_rows($result) == 0) {
+                               $result = db_query($link, "SELECT MAX(id) AS id FROM ttrss_archived_feeds");
+                               $new_feed_id = (int)db_fetch_result($result, 0, "id") + 1;
+
                                db_query($link, "INSERT INTO ttrss_archived_feeds
                                        (id, owner_uid, title, feed_url, site_url)
-                               SELECT id, owner_uid, title, feed_url, site_url from ttrss_feeds
+                               SELECT $new_feed_id, owner_uid, title, feed_url, site_url from ttrss_feeds
                                WHERE id = '$id'");
 
-                               $archive_id = $id;
+                               $archive_id = $new_feed_id;
                        } else {
                                $archive_id = db_fetch_result($result, 0, "id");
                        }