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

prefs: don't try to do anything on schema < 141

This commit is contained in:
Andrew Dolgov 2021-02-25 14:38:29 +03:00
parent 6f02b1afd0
commit 011e318947
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
classes/prefs.php
View File

@ -203,15 +203,17 @@ class Prefs {
} }
} }
// fill in any overrides from the database if (get_schema_version(true) >= 141) {
$sth = $this->pdo->prepare("SELECT pref_name, value FROM ttrss_user_prefs2 // fill in any overrides from the database
WHERE owner_uid = :uid AND $sth = $this->pdo->prepare("SELECT pref_name, value FROM ttrss_user_prefs2
(profile = :profile OR (:profile IS NULL AND profile IS NULL))"); WHERE owner_uid = :uid AND
(profile = :profile OR (:profile IS NULL AND profile IS NULL))");
$sth->execute(["uid" => $owner_uid, "profile" => $profile_id]); $sth->execute(["uid" => $owner_uid, "profile" => $profile_id]);
while ($row = $sth->fetch()) { while ($row = $sth->fetch()) {
$this->_set_cache($row["pref_name"], $row["value"], $owner_uid, $profile_id); $this->_set_cache($row["pref_name"], $row["value"], $owner_uid, $profile_id);
}
} }
} }
@ -225,6 +227,10 @@ class Prefs {
list ($def_val, $type_hint) = self::_DEFAULTS[$pref_name]; list ($def_val, $type_hint) = self::_DEFAULTS[$pref_name];
if (get_schema_version(true) < 141) {
return Config::cast_to($def_val, $type_hint);
}
$cached_value = $this->_get_cache($pref_name, $owner_uid, $profile_id); $cached_value = $this->_get_cache($pref_name, $owner_uid, $profile_id);
if (!empty($cached_value)) { if (!empty($cached_value)) {