4
0
Эх сурвалжийг харах

Fix load default action on shortcuts (#3394)

See #3388
Alexis Degrugillier 5 жил өмнө
parent
commit
0954c76866

+ 2 - 1
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();

+ 1 - 1
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>