diff options
| author | roundcube <roundcube@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2005-11-01 22:03:59 +0000 |
|---|---|---|
| committer | roundcube <roundcube@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2005-11-01 22:03:59 +0000 |
| commit | e81e1e6ba3f155303544a172819485ce96e65f05 (patch) | |
| tree | 6289f97c40d43d72d924ccfb984564e57400b8cc | |
| parent | 395de94f6579600292a7cf55d84e5f1e3a8bbf09 (diff) | |
Edited MDB2 support
git-svn-id: https://svn.roundcube.net/trunk@71 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/program/include/main.inc | 3 | ||||
| -rwxr-xr-x | roundcubemail/program/include/rcube_mdb2.inc | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc index 0ebbeaa5a..9248caa99 100644 --- a/roundcubemail/program/include/main.inc +++ b/roundcubemail/program/include/main.inc @@ -64,7 +64,8 @@ function rcmail_startup($task='mail') $DB->sqlite_initials = $INSTALL_PATH.'SQL/sqlite.initial.sql'; // we can use the database for storing session data - if (is_object($DB) && $DB->db_provider!='sqlite') + // session queries do not work with MDB2 + if ($CONFIG['db_backend']!='mdb2' && is_object($DB) && $DB->db_provider!='sqlite') include_once('include/session.inc'); diff --git a/roundcubemail/program/include/rcube_mdb2.inc b/roundcubemail/program/include/rcube_mdb2.inc index f87a9c029..f6fde8dd5 100755 --- a/roundcubemail/program/include/rcube_mdb2.inc +++ b/roundcubemail/program/include/rcube_mdb2.inc @@ -153,10 +153,10 @@ class rcube_db $this->db_handle->row_offset = $offset; $this->db_handle->row_limit = $numrows; - $result = $this->db_handle->query($query,$params); - //$q = $this->db_handle->prepare($query); - //$q->bindParamArray($params); - //$result = $q->execute(); + //$result = $this->db_handle->query($query,$params); + $q = $this->db_handle->prepare($query); + $q->bindParamArray($params); + $result = $q->execute(); if (PEAR::isError($result)) raise_error(array('code' => 500, |