From 159691e7b1174146fc1c839288e5dd0162d3e6f9 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 19 Jun 2012 06:20:27 -0400
Subject: [PATCH] Don't use protected property rcube_db::$db_error
---
installer/test.php | 2 +-
program/include/rcube_contacts.php | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/installer/test.php b/installer/test.php
index f09b2f7..28eb769 100644
--- a/installer/test.php
+++ b/installer/test.php
@@ -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;
diff --git a/program/include/rcube_contacts.php b/program/include/rcube_contacts.php
index 6984b49..534a65c 100644
--- a/program/include/rcube_contacts.php
+++ b/program/include/rcube_contacts.php
@@ -934,8 +934,8 @@
$contact_id
);
- if ($this->db->db_error)
- $this->set_error(self::ERROR_SAVING, $this->db->db_error_msg);
+ if ($error = $this->db->is_error())
+ $this->set_error(self::ERROR_SAVING, $error);
else
$added++;
}
--
Gitblit v1.9.1