valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Andrew Dolgov 2015-12-07 20:07:37 +03:00
parent a956648502 33d131d699
commit 6eed9a7463
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/rssfuncs.php
View File

@ -700,6 +700,10 @@
$entry_stored_hash = db_fetch_result($result, 0, "content_hash"); $entry_stored_hash = db_fetch_result($result, 0, "content_hash");
$article_labels = get_article_labels($base_entry_id, $owner_uid); $article_labels = get_article_labels($base_entry_id, $owner_uid);
$entry_language = db_fetch_result($result, 0, "lang"); $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 { } else {
$base_entry_id = false; $base_entry_id = false;
$entry_stored_hash = ""; $entry_stored_hash = "";

2
include/sessions.php
View File

@ -119,6 +119,8 @@
function ttrss_gc ($expire) { function ttrss_gc ($expire) {
Db::get()->query("DELETE FROM ttrss_sessions WHERE expire < " . time()); Db::get()->query("DELETE FROM ttrss_sessions WHERE expire < " . time());
return true;
} }
if (!SINGLE_USER_MODE /* && DB_TYPE == "pgsql" */) { if (!SINGLE_USER_MODE /* && DB_TYPE == "pgsql" */) {