diff options
| author | Andrew Dolgov <[email protected]> | 2013-04-02 18:51:24 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-04-02 18:51:24 +0400 |
| commit | 3c8665e239ff1281e87470efb7d793ddfcca1404 (patch) | |
| tree | c82111f56915d44ddf031c3f750a5f7d6285240f | |
| parent | b7041615c43e4c5f7dd44a13ab55f7314f7ae8ba (diff) | |
| parent | f9df3e698c8fb839cf0aa8bfbaf316a2bda13e74 (diff) | |
Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
| -rw-r--r-- | classes/pluginhost.php | 1 | ||||
| -rw-r--r-- | include/functions.php | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/classes/pluginhost.php b/classes/pluginhost.php index 5b8a77fd6..a75027033 100644 --- 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 9c58f807a..f273e2f80 100644 --- 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; } |