From 9e8e5fa634ace418e6b34280133685485b97a9c0 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 26 Aug 2008 03:21:50 -0400
Subject: [PATCH] - Removed support for PEAR::DB driver
---
program/include/rcmail.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index f3b3970..8a061be 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -216,10 +216,9 @@
public function get_dbh()
{
if (!$this->db) {
- $dbclass = "rcube_" . $this->config->get('db_backend', 'mdb2');
$config_all = $this->config->all();
- $this->db = new $dbclass($config_all['db_dsnw'], $config_all['db_dsnr'], $config_all['db_persistent']);
+ $this->db = new rcube_mdb2($config_all['db_dsnw'], $config_all['db_dsnr'], $config_all['db_persistent']);
$this->db->sqlite_initials = INSTALL_PATH . 'SQL/sqlite.initial.sql';
$this->db->set_debug((bool)$config_all['sql_debug']);
$this->db->db_connect('w');
@@ -860,7 +859,8 @@
unset($p['task']);
foreach ($p as $par => $val)
- $url .= '&'.urlencode($par).'='.urlencode($val);
+ if (isset($val))
+ $url .= '&'.urlencode($par).'='.urlencode($val);
return $url;
}
--
Gitblit v1.9.1