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

This commit is contained in:
Andrew Dolgov 2013-04-02 18:51:24 +04:00
commit 3c8665e239
2 changed files with 6 additions and 0 deletions

View File

@ -27,6 +27,7 @@ class PluginHost {
const HOOK_TOOLBAR_BUTTON = 15; const HOOK_TOOLBAR_BUTTON = 15;
const HOOK_ACTION_ITEM = 16; const HOOK_ACTION_ITEM = 16;
const HOOK_HEADLINE_TOOLBAR_BUTTON = 17; const HOOK_HEADLINE_TOOLBAR_BUTTON = 17;
const HOOK_HOTKEY_INFO = 18;
const KIND_ALL = 1; const KIND_ALL = 1;
const KIND_SYSTEM = 2; const KIND_SYSTEM = 2;

View File

@ -1934,6 +1934,11 @@
"help_dialog" => __("Show help dialog")) "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; return $hotkeys;
} }