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

Thomas Bruederli

2014-05-28 809f9d11bddc97272e116483bcc24e1db79bdc28

 program/include/rcmail_output_html.php

@@ -68,6 +68,7 @@
        $this->set_env('task', $task);
        $this->set_env('x_frame_options', $this->config->get('x_frame_options', 'sameorigin'));
        $this->set_env('standard_windows', (bool) $this->config->get('standard_windows'));
        $this->set_env('locale', $_SESSION['language']);

        // add cookie info
        $this->set_env('cookie_domain', ini_get('session.cookie_domain'));