From a8ac766132fe940b9824b279c62ae924de0a6c10 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 7 Dec 2015 11:54:24 +0300 Subject: do not discard custom set article tags when updating from source --- include/rssfuncs.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/rssfuncs.php b/include/rssfuncs.php index 115d9c9c2..8dfdbf01f 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 = ""; -- cgit v1.2.3 From 040aa5408a6556326ab1ca3e50c1563c97f7a2db Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 7 Dec 2015 15:06:32 +0300 Subject: fix previous, owner_uid not passed in daemon context --- include/rssfuncs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/rssfuncs.php b/include/rssfuncs.php index 8dfdbf01f..56a16ec6c 100755 --- a/include/rssfuncs.php +++ b/include/rssfuncs.php @@ -701,7 +701,7 @@ $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); + $existing_tags = get_article_tags($base_entry_id, $owner_uid); $entry_tags = array_unique(array_merge($entry_tags, $existing_tags)); } else { -- cgit v1.2.3 From 33d131d699350ae981235b1c94691ebc7e559824 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 7 Dec 2015 15:25:31 +0300 Subject: ttrss_gc: return true --- include/sessions.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/sessions.php b/include/sessions.php index c0ec64c3d..1ed9be550 100644 --- a/include/sessions.php +++ b/include/sessions.php @@ -119,6 +119,8 @@ function ttrss_gc ($expire) { Db::get()->query("DELETE FROM ttrss_sessions WHERE expire < " . time()); + + return true; } if (!SINGLE_USER_MODE /* && DB_TYPE == "pgsql" */) { -- cgit v1.2.3