From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Mon, 7 Dec 2015 08:54:24 +0000 (+0300)
Subject: do not discard custom set article tags when updating from source
X-Git-Tag: 16.3~70^2~2
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=a8ac766132fe940b9824b279c62ae924de0a6c10;p=tt-rss.git

do not discard custom set article tags when updating from source
---

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 115d9c9c..8dfdbf01 100755
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -700,6 +700,10 @@
 					$entry_stored_hash = db_fetch_result($result, 0, "content_hash");
 					$article_labels = get_article_labels($base_entry_id, $owner_uid);
 					$entry_language = db_fetch_result($result, 0, "lang");
+
+					$existing_tags = get_article_tags($base_entry_id);
+					$entry_tags = array_unique(array_merge($entry_tags, $existing_tags));
+
 				} else {
 					$base_entry_id = false;
 					$entry_stored_hash = "";