diff options
| author | Andrew Dolgov <[email protected]> | 2015-12-07 20:07:37 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2015-12-07 20:07:37 +0300 |
| commit | 6eed9a7463443d206bb9f9369b77be70ac84d9de (patch) | |
| tree | 6de666521d08041912fe9649a9ff420a47931b5d | |
| parent | a956648502ad55cce47bcce613fd938bd165caee (diff) | |
| parent | 33d131d699350ae981235b1c94691ebc7e559824 (diff) | |
Merge branch 'master' of git.tt-rss.org:fox/tt-rss
| -rwxr-xr-x | include/rssfuncs.php | 4 | ||||
| -rw-r--r-- | include/sessions.php | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/rssfuncs.php b/include/rssfuncs.php index 115d9c9c2..56a16ec6c 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, $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 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" */) { |