diff options
| author | Andrew Dolgov <[email protected]> | 2018-12-04 10:47:01 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2018-12-04 10:47:01 +0300 |
| commit | 197e80add6532b8470c6805131c88b91d5f714ea (patch) | |
| tree | fb488ca7a90182bc5ccfda393674cca34a624d1b /classes/pref | |
| parent | 7e7a15136bbce68f65f538b781cc47109de7ccc8 (diff) | |
fix several issues related to profile being set to a non-numeric value
Diffstat (limited to 'classes/pref')
| -rw-r--r-- | classes/pref/prefs.php | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index 41beabb9e..5a787bb0c 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -452,12 +452,16 @@ class Pref_Prefs extends Handler_Protected { print '<div dojoType="dijit.layout.ContentPane" region="center" style="overflow-y : auto">'; - if ($_SESSION["profile"]) { + $profile = $_SESSION["profile"]; + + if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null; + + if ($profile) { print_notice(__("Some preferences are only available in default profile.")); } if ($_SESSION["profile"]) { - initialize_user_prefs($_SESSION["uid"], $_SESSION["profile"]); + initialize_user_prefs($_SESSION["uid"], $profile); } else { initialize_user_prefs($_SESSION["uid"]); } @@ -473,7 +477,7 @@ class Pref_Prefs extends Handler_Protected { ttrss_user_prefs.pref_name = ttrss_prefs.pref_name AND owner_uid = :uid ORDER BY ttrss_prefs_sections.order_id,pref_name"); - $sth->execute([":uid" => $_SESSION['uid'], ":profile" => $_SESSION['profile']]); + $sth->execute([":uid" => $_SESSION['uid'], ":profile" => $profile]); $lnum = 0; @@ -497,8 +501,7 @@ class Pref_Prefs extends Handler_Protected { if (!$short_desc) continue; - if ($_SESSION["profile"] && in_array($line["pref_name"], - $profile_blacklist)) { + if ($profile && in_array($line["pref_name"], $profile_blacklist)) { continue; } |