summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rwxr-xr-xapp/models/RSSConfiguration.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/RSSConfiguration.php b/app/models/RSSConfiguration.php
index 8a8acafcb..741dd84a1 100755
--- a/app/models/RSSConfiguration.php
+++ b/app/models/RSSConfiguration.php
@@ -380,7 +380,7 @@ class RSSConfigurationDAO extends Model_array {
$this->old_entries = $this->array['old_entries'];
}
if (isset ($this->array['shortcuts'])) {
- $this->shortcuts = $this->array['shortcuts'];
+ $this->shortcuts = array_merge ($this->shortcuts, $this->array['shortcuts']);
}
if (isset ($this->array['mail_login'])) {
$this->mail_login = $this->array['mail_login'];