Merge branch 'master' of github.com:roundcube/roundcubemail

Aleksander Machniak

2015-02-17 701ef30c28a9db9a1ec905d3911a1fa346d1d010

Merge branch 'master' of github.com:roundcube/roundcubemail

 plugins/help/help.php

@@ -82,8 +82,14 @@
    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));

        // title might be already translated here, so revert to it's initial value
        // so button() will translate it correctly
        $attrib['title'] = $attrib['label'];

        return $rcmail->output->button($attrib);
    }