diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2019-04-08 23:19:50 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2019-04-08 23:19:50 +0200 |
| commit | 744a9e8cf00aef7dec0acfa5f90f0dcfa2ef8837 (patch) | |
| tree | ffa4b7671c71c837a1f8f6f47de9ae07ce738d80 /lib/lib_rss.php | |
| parent | d008b6c1a7488b99e77287ba14f1fff3ec1a116b (diff) | |
| parent | da53cc902c5e0ac2a05e92ad6b7780b6354d0438 (diff) | |
Merge pull request #2368 from FreshRSS/dev1.14.2
FreshRSS 1.14.2
Diffstat (limited to 'lib/lib_rss.php')
| -rw-r--r-- | lib/lib_rss.php | 9 |
1 files changed, 5 insertions, 4 deletions
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]; } } } |