From de56ea1909d515d3e4807a04a6c4644b8226d08d Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 08 Aug 2012 02:21:45 -0400
Subject: [PATCH] Merge branch 'pdo'
---
installer/test.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/installer/test.php b/installer/test.php
index 2dd3305..28eb769 100644
--- a/installer/test.php
+++ b/installer/test.php
@@ -125,9 +125,9 @@
$db_working = false;
if ($RCI->configured) {
if (!empty($RCI->config['db_dsnw'])) {
-
- $DB = new rcube_mdb2($RCI->config['db_dsnw'], '', false);
+ $DB = rcube_db::factory($RCI->config['db_dsnw'], '', false);
$DB->db_connect('w');
+
if (!($db_error_msg = $DB->is_error())) {
$RCI->pass('DSN (write)');
echo '<br />';
@@ -167,7 +167,7 @@
// test database
if ($db_working) {
$db_read = $DB->query("SELECT count(*) FROM {$RCI->config['db_table_users']}");
- if ($DB->db_error) {
+ if ($DB->is_error()) {
$RCI->fail('DB Schema', "Database not initialized");
echo '<p><input type="submit" name="initdb" value="Initialize database" /></p>';
$db_working = false;
--
Gitblit v1.9.1