From 66773789e392305bba4cdf7ed8e6ae3b8380de51 Mon Sep 17 00:00:00 2001
From: svncommit <devs@roundcube.net>
Date: Thu, 27 Oct 2005 09:45:33 -0400
Subject: [PATCH]
---
program/include/rcube_mdb2.inc | 36 ++----------------------------------
1 files changed, 2 insertions(+), 34 deletions(-)
diff --git a/program/include/rcube_mdb2.inc b/program/include/rcube_mdb2.inc
index 53590aa..4637bed 100755
--- a/program/include/rcube_mdb2.inc
+++ b/program/include/rcube_mdb2.inc
@@ -55,7 +55,7 @@
function dsn_connect($dsn)
{
// Use persistent connections if available
- $dbh = MDB2::factory($dsn, array('persistent' => TRUE));
+ $dbh = MDB2::factory($dsn, array('persistent' => $true));
if (PEAR::isError($dbh))
raise_error(array('code' => 500,
@@ -104,37 +104,21 @@
// Query database
function query()
-
{
-
$params = func_get_args();
-
$query = array_shift($params);
-
-
return $this->_query($query, 0, 0, $params);
-
}
-
-
function limitquery()
-
{
-
$params = func_get_args();
-
$query = array_shift($params);
-
$offset = array_shift($params);
-
$numrows = array_shift($params);
-
-
return $this->_query($query, $offset, $numrows, $params);
-
}
function _query($query, $offset, $numrows, $params)
@@ -153,7 +137,7 @@
$this->db_handle->row_offset = $offset;
$this->db_handle->row_limit = $numrows;
- $result = $this->db_handle->query($query);
+ $result = $this->db_handle->query($query,$params);
if (PEAR::isError($result))
raise_error(array('code' => 500,
@@ -210,39 +194,23 @@
}
function quoteIdentifier ( $str )
-
{
-
if (!$this->db_handle)
-
$this->db_connect('r');
-
-
return $this->db_handle->quoteIdentifier($str);
-
}
function unixtimestamp($field)
-
{
-
switch($this->db_provider)
-
{
-
case 'pgsql':
-
return "EXTRACT (EPOCH FROM $field)";
-
break;
-
default:
-
return "UNIX_TIMESTAMP($field)";
-
}
-
}
function _add_result($res, $query)
--
Gitblit v1.9.1