From 68f39efb0476ba2d3cfe68ec49b5d6c1afcfdab0 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 26 Apr 2011 07:30:45 +0000
Subject: - Fix fatal error from last commit (#1487884), rename rcube_gc() to
 gc()

---
 program/include/rcube_session.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/program/include/rcube_session.php b/program/include/rcube_session.php
index 97dfe3c0d..3f1e1ccd2 100644
--- a/program/include/rcube_session.php
+++ b/program/include/rcube_session.php
@@ -166,12 +166,12 @@ class rcube_session
     if ($key == $this->key && $ts - $this->start < 0.5) {
       $oldvars = $this->vars;
     } else { // else read data again from DB
-      $oldvars = $this->read($key);
+      $oldvars = $this->db_read($key);
     }
 
     if ($oldvars !== false) {
       $newvars = $this->_fixvars($vars, $oldvars);
-      
+
       if ($newvars !== $oldvars) {
         $this->db->query(
           sprintf("UPDATE %s SET vars=?, changed=%s WHERE sess_id=?",
@@ -193,8 +193,8 @@ class rcube_session
     $this->unsets = array();
     return true;
   }
-  
-  
+
+
   private function _fixvars($vars, $oldvars)
   {
     $ts = microtime(true);
@@ -211,7 +211,7 @@ class rcube_session
       else
         $newvars = $vars;
     }
-    
+
     $this->unsets = array();
     return $newvars;
   }
@@ -246,7 +246,7 @@ class rcube_session
       sprintf("DELETE FROM %s WHERE changed < %s",
         get_table_name('session'), $this->db->fromunixtime(time() - $maxlifetime)));
 
-    $this->rcube_gc();
+    $this->gc();
 
     return true;
   }
@@ -315,7 +315,7 @@ class rcube_session
   /**
    * Execute registered garbage collector routines
    */
-  public function rcube_gc()
+  public function gc()
   {
     foreach ($this->gc_handlers as $fct)
       $fct();
-- 
cgit v1.2.3