diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2019-04-07 21:39:48 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2019-04-07 21:39:48 +0200 |
| commit | 295cb89af386c208b82c47250e74c06d76191cf8 (patch) | |
| tree | e0564c7e6130fb5d46b98a620e83731f566ab6d2 | |
| parent | eae10a985cbc20e46bafafce02521fd5aaf886a8 (diff) | |
Fix PHP 5.5 compat for array const (#2360)
https://github.com/FreshRSS/FreshRSS/issues/2359
| -rwxr-xr-x | app/Controllers/configureController.php | 3 | ||||
| -rw-r--r-- | lib/lib_rss.php | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php index 16dd82121..6d3c4dcce 100755 --- a/app/Controllers/configureController.php +++ b/app/Controllers/configureController.php @@ -166,7 +166,8 @@ class FreshRSS_configure_Controller extends Minz_ActionController { * tab and up. */ public function shortcutAction() { - $this->view->list_keys = SHORTCUT_KEYS; + global $SHORTCUT_KEYS; + $this->view->list_keys = $SHORTCUT_KEYS; if (Minz_Request::isPost()) { FreshRSS_Context::$user_conf->shortcuts = validateShortcutList(Minz_Request::param('shortcuts')); diff --git a/lib/lib_rss.php b/lib/lib_rss.php index fd1389047..c0ea23989 100644 --- a/lib/lib_rss.php +++ b/lib/lib_rss.php @@ -549,7 +549,7 @@ function _i($icon, $url_only = false) { } -const SHORTCUT_KEYS = array( +$SHORTCUT_KEYS = array( //No const for < PHP 5.6 compatibility '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', @@ -559,6 +559,7 @@ const SHORTCUT_KEYS = array( ); function validateShortcutList($shortcuts) { + global $SHORTCUT_KEYS; $legacy = array( 'down' => 'ArrowDown', 'left' => 'ArrowLeft', 'page_down' => 'PageDown', 'page_up' => 'PageUp', 'right' => 'ArrowRight', 'up' => 'ArrowUp', @@ -567,17 +568,17 @@ function validateShortcutList($shortcuts) { $shortcuts_ok = array(); foreach ($shortcuts as $key => $value) { - if (in_array($value, SHORTCUT_KEYS)) { + if (in_array($value, $SHORTCUT_KEYS)) { $shortcuts_ok[$key] = $value; } elseif (isset($legacy[$value])) { $shortcuts_ok[$key] = $legacy[$value]; } else { //Case-insensitive search if ($upper === null) { - $upper = array_map('strtoupper', SHORTCUT_KEYS); + $upper = array_map('strtoupper', $SHORTCUT_KEYS); } $i = array_search(strtoupper($value), $upper); if ($i !== false) { - $shortcuts_ok[$key] = SHORTCUT_KEYS[$i]; + $shortcuts_ok[$key] = $SHORTCUT_KEYS[$i]; } } } |