Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS

diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index 5b8a77fd64e9d8e90991a863ff4e115715dc9bb3..a75027033ae57227e791f063c7297de917070c6d 100644 (file)
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -27,6 +27,7 @@ class PluginHost {
        const HOOK_TOOLBAR_BUTTON = 15;
        const HOOK_ACTION_ITEM = 16;
        const HOOK_HEADLINE_TOOLBAR_BUTTON = 17;
+       const HOOK_HOTKEY_INFO = 18;
 
        const KIND_ALL = 1;
        const KIND_SYSTEM = 2;

diff --git a/include/functions.php b/include/functions.php
index 9c58f807aa1b391818f2c9074d76cad56fd971fd..f273e2f80245f9adce87445eb4339059d9e0aac7 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -1934,6 +1934,11 @@
                                "help_dialog" => __("Show help dialog"))
                        );
 
+               global $pluginhost;
+               foreach ($pluginhost->get_hooks($pluginhost::HOOK_HOTKEY_INFO) as $plugin) {
+                       $hotkeys = $plugin->hook_hotkey_info($hotkeys);
+               }
+
                return $hotkeys;
        }