update: only load existing labels of previously imported articles

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 12099293cec6098105d419346d2deaccee1d9e9b..3e0decb4193670b583cd731906959ae629f04a38 100644 (file)
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -811,6 +811,9 @@
                                                        '$entry_comments',
                                                        '$num_comments',
                                                        '$entry_author')");
+
+                                       $article_labels = array();
+
                                } else {
                                        // we keep encountering the entry in feeds, so we need to
                                        // update date_updated column so that we don't get horrible
@@ -821,6 +824,8 @@
 
                                        db_query($link, "UPDATE ttrss_entries SET date_updated = NOW()
                                                WHERE id = '$base_entry_id'");
+
+                                       $article_labels = get_article_labels($link, $base_entry_id, $owner_uid);
                                }
 
                                // now it should exist, if not - bad luck then
@@ -875,8 +880,6 @@
                                                }
                                        }
 
-                                       $article_labels = get_article_labels($link, $entry_ref_id, $owner_uid);
-
                                        if (find_article_filter($article_filters, "filter")) {
                                                db_query($link, "COMMIT"); // close transaction in progress
                                                continue;