- Skip session initialization/configuration if session is initialized already (e.g. using Installer)

git-svn-id: https://svn.roundcube.net/trunk@3555 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 12 insertions, 2 deletions

diff --git a/roundcubemail/program/include/rcmail.php b/roundcubemail/program/include/rcmail.php
index c9a06584a..1934535bf 100644
--- a/roundcubemail/program/include/rcmail.php
+++ b/roundcubemail/program/include/rcmail.php
@@ -350,7 +350,7 @@ class rcmail
       $this->output = new rcube_template($this->task, $framed);
 
     // set keep-alive/check-recent interval
-    if ($keep_alive = $this->session->get_keep_alive()) {
+    if ($this->session && ($keep_alive = $this->session->get_keep_alive())) {
       $this->output->set_env('keep_alive', $keep_alive);
     }
 
@@ -481,6 +481,10 @@ class rcmail
    */
   public function session_init()
   {
+    // session started (Installer?)
+    if (session_id())
+      return;
+
     $lifetime = $this->config->get('session_lifetime', 0) * 60;
 
     // set session domain
@@ -522,6 +526,9 @@ class rcmail
    */
   public function session_configure()
   {
+    if (!$this->session)
+      return;
+
     $lifetime = $this->config->get('session_lifetime', 0) * 60;
 
     // set keep-alive/check-recent interval
@@ -980,7 +987,10 @@ class rcmail
         $mem .= '/'.show_bytes(memory_get_peak_usage());
 
       $log = $this->task . ($this->action ? '/'.$this->action : '') . ($mem ? " [$mem]" : '');
-      rcube_print_time(RCMAIL_START, $log);
+      if (defined('RCMAIL_START'))
+        rcube_print_time(RCMAIL_START, $log);
+      else
+        console($log);
     }
   }