Changeset 2463 in subversion for trunk/roundcubemail/program/include/rcube_mdb2.php

Timestamp:

May 9, 2009 4:07:10 PM (4 years ago)

Author:

alec

Message:

• Fix session handling on non-session SQL query error (#1485734)

File:

• trunk/roundcubemail/program/include/rcube_mdb2.php (modified) (3 diffs)

trunk/roundcubemail/program/include/rcube_mdb2.php

@@ -179 +179 @@
 
   /**
+   * Connection state checker
+   *
+   * @param  boolean  True if in connected state
+   */
+  function is_connected()
+    {
+    return PEAR::isError($this->db_handle) ? false : true;
+    }
+
+
+  /**
    * Execute a SQL query
    *
@@ -188 +199 @@
   function query()
     {
+    if (!$this->is_connected())
+      return NULL;
+    
     $params = func_get_args();
     $query = array_shift($params);
@@ -361 +375 @@
   function _fetch_row($result, $mode)
     {
-    if ($result === FALSE || PEAR::isError($result))
+    if ($result === FALSE || PEAR::isError($result) || !$this->is_connected())
       return FALSE;