From 35eed83b64486d7c0e6f62dafc4ddf70e7a50513 Mon Sep 17 00:00:00 2001 From: Alexis Degrugillier Date: Tue, 14 Jul 2020 11:02:30 +0200 Subject: Add a way to disable shortcuts (#3114) When the user do not want to use a shortcut, he can let the shortcut value empty. This will save an empty configuration thus disabling the shortcut. The load default action allows to use default shortcut only for disabled shortcuts. See #3110 --- app/Controllers/configureController.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'app/Controllers/configureController.php') diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php index ba7316472..78b939a91 100755 --- a/app/Controllers/configureController.php +++ b/app/Controllers/configureController.php @@ -174,7 +174,11 @@ class FreshRSS_configure_Controller extends Minz_ActionController { $this->view->list_keys = SHORTCUT_KEYS; if (Minz_Request::isPost()) { - FreshRSS_Context::$user_conf->shortcuts = validateShortcutList(Minz_Request::param('shortcuts')); + $shortcuts = Minz_Request::param('shortcuts'); + if (false !== Minz_Request::param('load_default_shortcuts')) { + $shortcuts = array_filter($shortcuts); + } + FreshRSS_Context::$user_conf->shortcuts = validateShortcutList($shortcuts); FreshRSS_Context::$user_conf->save(); invalidateHttpCache(); -- cgit v1.2.3