diff options
| author |  Alexis Degrugillier <aledeg@users.noreply.github.com>
| 2021-01-23 18:42:21 -0500 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2021-01-24 00:42:21 +0100 |
| commit | 0954c768667f0098b6e74da8c9d3739d8d5486cf (patch) | |
| tree | a6b1d5f9dcd9bbaa9cdd42eeb82d7269134ee2bd | |
| parent | 3e89086e45669de82c4005e11ded1ce8f60a1bc3 (diff) | |
Fix load default action on shortcuts (#3394)
See #3388
| -rwxr-xr-x | app/Controllers/configureController.php | 3 | ||||
| -rw-r--r-- | app/views/configure/shortcut.phtml | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php index 9316f6ea6..f658d1c44 100755 --- a/app/Controllers/configureController.php +++ b/app/Controllers/configureController.php @@ -179,7 +179,8 @@ class FreshRSS_configure_Controller extends Minz_ActionController { if (Minz_Request::isPost()) { $shortcuts = Minz_Request::param('shortcuts'); if (false !== Minz_Request::param('load_default_shortcuts')) { - $shortcuts = array_filter($shortcuts); + $default = Minz_Configuration::load(FRESHRSS_PATH . '/config-user.default.php'); + $shortcuts = $data['shortcuts']; } FreshRSS_Context::$user_conf->shortcuts = validateShortcutList($shortcuts); FreshRSS_Context::$user_conf->save(); diff --git a/app/views/configure/shortcut.phtml b/app/views/configure/shortcut.phtml index 7ed12f42b..b24bc9101 100644 --- a/app/views/configure/shortcut.phtml +++ b/app/views/configure/shortcut.phtml @@ -184,7 +184,7 @@ <div class="form-group form-actions"> <div class="group-controls"> <button type="submit" class="btn btn-important"><?= _t('gen.action.submit') ?></button> - <button type="submit" class="btn btn-important" name="load_default_shortcuts"><?= _t('gen.action.load_default_shortcuts') ?></button> + <button type="submit" class="btn btn-important confirm" name="load_default_shortcuts" value="1"><?= _t('gen.action.load_default_shortcuts') ?></button> <button type="reset" class="btn"><?= _t('gen.action.cancel') ?></button> </div> </div> |