Merge branch 'master' of git.tt-rss.org:fox/tt-rss

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, $owner_uid);
+					$entry_tags = array_unique(array_merge($entry_tags, $existing_tags));
+
 				} else {
 					$base_entry_id = false;
 					$entry_stored_hash = "";

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" */) {