Fix opening in new window; keep extwin mode when switching help actions

1 files changed, 9 insertions, 0 deletions

diff --git a/plugins/help/help.php b/plugins/help/help.php
index ab665d0a8..37fd908a3 100644
--- a/plugins/help/help.php
+++ b/plugins/help/help.php
@@ -61,6 +61,7 @@ class help extends rcube_plugin
         // register UI objects
         $rcmail->output->add_handlers(array(
             'helpcontent' => array($this, 'content'),
+            'tablink' => array($this, 'tablink'),
         ));
 
         if ($rcmail->action == 'about')
@@ -73,6 +74,14 @@ class help extends rcube_plugin
         $rcmail->output->send('help.help');
     }
 
+    function tablink($attrib)
+    {
+        $rcmail = rcmail::get_instance();
+        $attrib['name'] = 'helplink' . $attrib['action'];
+        $attrib['href'] = $rcmail->url(array('_action' => $attrib['action'], '_extwin' => !empty($_REQUEST['_extwin']) ? 1 : null));
+        return $rcmail->output->button($attrib);
+    }
+
     function content($attrib)
     {
         $rcmail = rcmail::get_instance();