From 0954c768667f0098b6e74da8c9d3739d8d5486cf Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <aledeg@users.noreply.github.com>
Date: Sat, 23 Jan 2021 18:42:21 -0500
Subject: Fix load default action on shortcuts (#3394)

See #3388
---
 app/Controllers/configureController.php | 3 ++-
 app/views/configure/shortcut.phtml      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'app')

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>
-- 
cgit v1.2.3