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

wrap prefs->migrate() into a transaction block

This commit is contained in:
Andrew Dolgov 2021-02-25 19:21:29 +03:00
parent 89ad25405e
commit 281f2efeb8
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
classes/prefs.php
View File

@ -162,6 +162,9 @@ class Prefs {
$owner_uid = (int) $_SESSION["uid"]; $owner_uid = (int) $_SESSION["uid"];
$profile_id = $_SESSION["profile"] ?? null; $profile_id = $_SESSION["profile"] ?? null;
$in_nested_tr = false;
$this->migrate($owner_uid, $profile_id); $this->migrate($owner_uid, $profile_id);
$this->cache_all($owner_uid, $profile_id); $this->cache_all($owner_uid, $profile_id);
}; };
@ -352,6 +355,14 @@ class Prefs {
if (!$this->_get(Prefs::_PREFS_MIGRATED, $owner_uid, $profile_id)) { if (!$this->_get(Prefs::_PREFS_MIGRATED, $owner_uid, $profile_id)) {
$in_nested_tr = false;
try {
$this->pdo->beginTransaction();
} catch (PDOException $e) {
$in_nested_tr = true;
}
$sth = $this->pdo->prepare("SELECT pref_name, value FROM ttrss_user_prefs $sth = $this->pdo->prepare("SELECT pref_name, value FROM ttrss_user_prefs
WHERE owner_uid = :uid AND WHERE owner_uid = :uid AND
(profile = :profile OR (:profile IS NULL AND profile IS NULL))"); (profile = :profile OR (:profile IS NULL AND profile IS NULL))");
@ -370,6 +381,11 @@ class Prefs {
} }
$this->_set(Prefs::_PREFS_MIGRATED, "1", $owner_uid, $profile_id); $this->_set(Prefs::_PREFS_MIGRATED, "1", $owner_uid, $profile_id);
if (!$in_nested_tr)
$this->pdo->commit();
Logger::log(E_USER_NOTICE, sprintf("Migrated preferences of user %d (profile %d)", $owner_uid, $profile_id));
} }
} }