diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2015-01-16 23:20:59 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2015-01-16 23:20:59 +0100 |
| commit | 9483c6cf6759364678ca37d3f8379d35c72a8675 (patch) | |
| tree | 3c82695d046b7b81a10bfd150802f473ec53be47 /app | |
| parent | 4c143426712f75fa04999f4e8b3c0b6900bf062d (diff) | |
Fix bug if a shortcut is not in the initial config
A new shortcut was never saved because ConfigurationSetter never set a
shortcut which did not appear in the initial conf.
Diffstat (limited to 'app')
| -rw-r--r-- | app/Models/ConfigurationSetter.php | 4 | ||||
| -rw-r--r-- | app/views/configure/shortcut.phtml | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php index f1c465c7c..e808630b4 100644 --- a/app/Models/ConfigurationSetter.php +++ b/app/Models/ConfigurationSetter.php @@ -154,9 +154,7 @@ class FreshRSS_ConfigurationSetter { private function _shortcuts(&$data, $values) { foreach ($values as $key => $value) { - if (isset($data['shortcuts'][$key])) { - $data['shortcuts'][$key] = $value; - } + $data['shortcuts'][$key] = $value; } } diff --git a/app/views/configure/shortcut.phtml b/app/views/configure/shortcut.phtml index fdbeed3ea..f68091af9 100644 --- a/app/views/configure/shortcut.phtml +++ b/app/views/configure/shortcut.phtml @@ -114,7 +114,7 @@ <div class="form-group"> <label class="group-name" for="close_dropdown_shortcut"><?php echo _t('conf.shortcut.close_dropdown'); ?></label> <div class="group-controls"> - <input type="text" id="help_shortcut" name="shortcuts[close_dropdown]" list="keys" value="<?php echo $s['close_dropdown']; ?>" /> + <input type="text" id="close_dropdown" name="shortcuts[close_dropdown]" list="keys" value="<?php echo $s['close_dropdown']; ?>" /> </div> </div> |