aboutsummaryrefslogtreecommitdiff
path: root/app/Models/ConfigurationSetter.php
diff options
context:
space:
mode:
Diffstat (limited to 'app/Models/ConfigurationSetter.php')
-rw-r--r--app/Models/ConfigurationSetter.php12
1 files changed, 5 insertions, 7 deletions
diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php
index f1c465c7c..eeb1f2f4c 100644
--- a/app/Models/ConfigurationSetter.php
+++ b/app/Models/ConfigurationSetter.php
@@ -153,11 +153,11 @@ class FreshRSS_ConfigurationSetter {
}
private function _shortcuts(&$data, $values) {
- foreach ($values as $key => $value) {
- if (isset($data['shortcuts'][$key])) {
- $data['shortcuts'][$key] = $value;
- }
+ if (!is_array($values)) {
+ return;
}
+
+ $data['shortcuts'] = $values;
}
private function _sort_order(&$data, $value) {
@@ -210,9 +210,7 @@ class FreshRSS_ConfigurationSetter {
private function _mark_when(&$data, $values) {
foreach ($values as $key => $value) {
- if (isset($data['mark_when'][$key])) {
- $data['mark_when'][$key] = $this->handleBool($value);
- }
+ $data['mark_when'][$key] = $this->handleBool($value);
}
}