From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 30 Oct 2012 11:10:52 +0000 (+0400)
Subject: update: only load existing labels of previously imported articles
X-Git-Tag: 1.6.1~36
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=e8291805dd99e0f6047edbb1ea162c1f3af3d0ee;p=tt-rss.git

update: only load existing labels of previously imported articles
---

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 12099293..3e0decb4 100644
--- 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;