rssutils: PDO

[tt-rss.git] / classes / ccache.php

diff --git a/classes/ccache.php b/classes/ccache.php
index 9a6f14f3d867fad5f65d94fef0a549a339d95a47..88e28e9e83e6ba23642fc90693f9b9fb720c2ad1 100644 (file)
--- a/classes/ccache.php
+++ b/classes/ccache.php
@@ -142,7 +142,13 @@ class CCache {
                        $unread = (int) Feeds::getFeedArticles($feed_id, $is_cat, true, $owner_uid);
                }
 
-               $pdo->beginTransaction();
+               $tr_in_progress = false;
+
+               try {
+                       $pdo->beginTransaction();
+               } catch (Exception $e) {
+                       $tr_in_progress = true;
+               }
 
                $sth = $pdo->prepare("SELECT feed_id FROM $table
                        WHERE owner_uid = ? AND feed_id = ? LIMIT 1");
@@ -164,7 +170,7 @@ class CCache {
                        $sth->execute([$feed_id, $unread, $owner_uid]);
                }
 
-               $pdo->commit();
+               if (!$tr_in_progress) $pdo->commit();
 
                if ($feed_id > 0 && $prev_unread != $unread) {