aboutsummaryrefslogtreecommitdiff
path: root/app/Models/ConfigurationSetter.php
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2015-09-12 18:43:20 +0200
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2015-09-12 18:43:20 +0200
commitea47e2b1d49f706792e864201f5731ba1e70d20f (patch)
treed2f3722d277c7ddf092c4bf0de04ca45852e839e /app/Models/ConfigurationSetter.php
parent9a7d54f02199134735e2c1c5d888eee4522a76b8 (diff)
parent0204e8ff08ba9ae103c46d08484cf30aedfb9148 (diff)
Merge branch 'FreshRSS/dev' into dev
Diffstat (limited to 'app/Models/ConfigurationSetter.php')
-rw-r--r--app/Models/ConfigurationSetter.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php
index 992a3a387..5c8a1ce29 100644
--- a/app/Models/ConfigurationSetter.php
+++ b/app/Models/ConfigurationSetter.php
@@ -119,6 +119,8 @@ class FreshRSS_ConfigurationSetter {
foreach ($values as $value) {
if ($value instanceof FreshRSS_UserQuery) {
$data['queries'][] = $value->toArray();
+ } elseif (is_array($value)) {
+ $data['queries'][] = $value;
}
}
}