Merge branch 'pda-rss-now' of richm/tt-rss into pdo-experimental

This commit is contained in:
fox 2017-12-11 04:01:28 +00:00 committed by Gogs
commit 9306918767
1 changed files with 2 additions and 2 deletions

View File

@ -953,10 +953,10 @@ class RSSUtils {
(ref_id, owner_uid, feed_id, unread, last_read, marked, (ref_id, owner_uid, feed_id, unread, last_read, marked,
published, score, tag_cache, label_cache, uuid, published, score, tag_cache, label_cache, uuid,
last_marked, last_published) last_marked, last_published)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, '', '', '', ?, ?)"); VALUES (?, ?, ?, ?, ?, ?, ?, ?, '', '', '', ".$last_marked.", ".$last_published.")");
$sth->execute([$ref_id, $owner_uid, $feed, $unread, $last_read_qpart, $marked, $sth->execute([$ref_id, $owner_uid, $feed, $unread, $last_read_qpart, $marked,
$published, $score, $last_marked, $last_published]); $published, $score]);
$sth = $pdo->prepare("SELECT int_id FROM ttrss_user_entries WHERE $sth = $pdo->prepare("SELECT int_id FROM ttrss_user_entries WHERE
ref_id = ? AND owner_uid = ? AND ref_id = ? AND owner_uid = ? AND