summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfox <[email protected]>2022-01-14 10:24:57 +0300
committerfox <[email protected]>2022-01-14 10:24:57 +0300
commitd3f26cc4a6f960fd9c2d0277040ebcce087a883a (patch)
tree61eeb7013874e0c9bae0592bf611276781a0daba
parent420782418d18ec922944d0bdf6bf5edb74be26e3 (diff)
parentaaccf89501af9734e86791e51cdc0063d8d0daec (diff)
Merge pull request '[RFC] update_rss_feed: juxtapose pdo and ORM commit on timestamp update' (#63) from rtollert/tt-rss:update-rss-deadlock1 into master
Reviewed-on: https://git.tt-rss.org/fox/tt-rss/pulls/63
-rwxr-xr-xclasses/rssutils.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/classes/rssutils.php b/classes/rssutils.php
index e826a32f8..8af544a12 100755
--- a/classes/rssutils.php
+++ b/classes/rssutils.php
@@ -786,13 +786,13 @@ class RSSUtils {
// dupes when the entry gets purged and reinserted again e.g.
// in the case of SLOW SLOW OMG SLOW updating feeds
+ $pdo->commit();
+
$entry_obj = ORM::for_table('ttrss_entries')
->find_one($base_entry_id)
->set('date_updated', Db::NOW())
->save();
- $pdo->commit();
-
continue;
}