Fix session garbage collector handler registration after refactoring

3 files changed, 2 insertions, 3 deletions

diff --git a/program/lib/Roundcube/rcube.php b/program/lib/Roundcube/rcube.php
index 3d081539f..cf6ebf993 100644
--- a/program/lib/Roundcube/rcube.php
+++ b/program/lib/Roundcube/rcube.php
@@ -523,6 +523,7 @@ class rcube
 
         // get session driver instance
         $this->session = rcube_session::factory($this->config);
+        $this->session->register_gc_handler(array($this, 'gc'));
 
         // start PHP session (if not in CLI mode)
         if ($_SERVER['REMOTE_ADDR']) {
diff --git a/program/lib/Roundcube/rcube_session.php b/program/lib/Roundcube/rcube_session.php
index fc1d87150..ab5c24c1e 100644
--- a/program/lib/Roundcube/rcube_session.php
+++ b/program/lib/Roundcube/rcube_session.php
@@ -86,9 +86,6 @@ abstract class rcube_session
     {
         $this->config = $config;
 
-        // register default gc handler
-        $this->register_gc_handler(array($this, 'gc'));
-
         // set secret
         $this->set_secret($this->config->get('des_key') . dirname($_SERVER['SCRIPT_NAME']));
 
diff --git a/program/lib/Roundcube/rcube_session_db.php b/program/lib/Roundcube/rcube_session_db.php
index 78138d1eb..4d94f43ff 100644
--- a/program/lib/Roundcube/rcube_session_db.php
+++ b/program/lib/Roundcube/rcube_session_db.php
@@ -168,6 +168,7 @@ class rcube_session_db extends rcube_session
         // just clean all old sessions when this GC is called
         $this->db->query("DELETE FROM " . $this->db->table_name('session')
                          . " WHERE changed < " . $this->db->now(-$this->gc_enabled));
+        $this->log("Session GC (DB): remove records < " . date('Y-m-d H:i:s', time() - $this->gc_enabled) . '; rows = ' . intval($this->db->affected_rows()));
     }
 
 }
\ No newline at end of file