From 082246d13f524aa646d5aedf49ae7e3b6c621d6c Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Mon, 18 Nov 2013 09:53:25 +0100 Subject: Raccourcis : tolère l'ajout de nouveaux MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Tolère l'ajout de nouveaux inconnus des versions précédents de FreshRSS, et plus robuste en cas de mauvais fichier de configuration utilisateur. --- app/models/RSSConfiguration.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models/RSSConfiguration.php') 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']; -- cgit v1.2.3