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

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 115d9c9c2ce1cd4379e9b95461feaf5120f40e6e..56a16ec6c2f9db2a8e237bc0ea10f91ac3267fa1 100755 (executable)
--- 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, $owner_uid);
+                                       $entry_tags = array_unique(array_merge($entry_tags, $existing_tags));
+
                                } else {
                                        $base_entry_id = false;
                                        $entry_stored_hash = "";

diff --git a/include/sessions.php b/include/sessions.php
index c0ec64c3d905782e011a4432b086633a9dd8c4aa..1ed9be5504bd2fb1021c713a4b9c285c8ef0f0a5 100644 (file)
--- 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" */) {