summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2012-10-30 15:10:52 +0400
committerAndrew Dolgov <[email protected]>2012-10-30 15:10:52 +0400
commite8291805dd99e0f6047edbb1ea162c1f3af3d0ee (patch)
treea53761c9a4385fa92d3303934f3fd7ad0c5602b8 /include
parentbb894b29902f78e298c43a8d6a6ac19a856456a8 (diff)
update: only load existing labels of previously imported articles
Diffstat (limited to 'include')
-rw-r--r--include/rssfuncs.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 12099293c..3e0decb41 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;