diff options
| author | Aleksander Machniak <alec@alec.pl> | 2012-08-21 11:23:17 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2012-08-21 11:23:17 +0200 |
| commit | 74d7841c2643434fbd3e8759f160bda05f82ab0d (patch) | |
| tree | 8d94c1e21d9b2c103f52d13e1ea0a0d7f64a1a70 /program/include/rcube_output_html.php | |
| parent | 9cb76ad3c2ebcf6f75053de2e686390470dce7ba (diff) | |
| parent | ae7027de029e28fdd3894efe919b6171b2b11eab (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
Conflicts:
CHANGELOG
Diffstat (limited to 'program/include/rcube_output_html.php')
| -rw-r--r-- | program/include/rcube_output_html.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/program/include/rcube_output_html.php b/program/include/rcube_output_html.php index 0a8f0e364..a071ee354 100644 --- a/program/include/rcube_output_html.php +++ b/program/include/rcube_output_html.php @@ -67,6 +67,11 @@ class rcube_output_html extends rcube_output $this->set_env('task', $task); $this->set_env('x_frame_options', $this->config->get('x_frame_options', 'sameorigin')); + // add cookie info + $this->set_env('cookie_domain', ini_get('session.cookie_domain')); + $this->set_env('cookie_path', ini_get('session.cookie_path')); + $this->set_env('cookie_secure', ini_get('session.cookie_secure')); + // load the correct skin (in case user-defined) $skin = $this->config->get('skin'); $this->set_skin($skin); |