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

Thomas Bruederli

2012-06-14 207d618c22f6e50cf1dff983791282afe9f267ce

 program/include/rcube_output_html.php

@@ -68,7 +68,9 @@
        $this->set_env('x_frame_options', $this->config->get('x_frame_options', 'sameorigin'));

        // load the correct skin (in case user-defined)
        $this->set_skin($this->config->get('skin'));
        $skin = $this->config->get('skin');
        $this->set_skin($skin);
        $this->set_env('skin', $skin);

        // add common javascripts
        $this->add_script('var '.rcmail::JS_OBJECT_NAME.' = new rcube_webmail();', 'head_top');