From 0d94fd45f422fe0d0460f5db7a7761f56bc18236 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 19 Jun 2012 10:46:41 +0200
Subject: New database layer based on PHP PDO

---
 program/include/rcube_contacts.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'program/include/rcube_contacts.php')

diff --git a/program/include/rcube_contacts.php b/program/include/rcube_contacts.php
index f7fc65147..6984b49cc 100644
--- a/program/include/rcube_contacts.php
+++ b/program/include/rcube_contacts.php
@@ -36,7 +36,7 @@ class rcube_contacts extends rcube_addressbook
     /**
      * Store database connection.
      *
-     * @var rcube_mdb2
+     * @var rcube_db
      */
     private $db = null;
     private $user_id = 0;
@@ -990,9 +990,10 @@ class rcube_contacts extends rcube_addressbook
                 $checkname);
 
             // append number to make name unique
-            if ($hit = $this->db->num_rows($sql_result))
+            if ($hit = $this->db->fetch_array($sql_result)) {
                 $checkname = $name . ' ' . $num++;
-        } while ($hit > 0);
+            }
+        } while ($hit);
 
         return $checkname;
     }
-- 
cgit v1.2.3


From 159691e7b1174146fc1c839288e5dd0162d3e6f9 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 19 Jun 2012 12:20:27 +0200
Subject: 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(-)

(limited to 'program/include/rcube_contacts.php')

diff --git a/installer/test.php b/installer/test.php
index f09b2f7c7..28eb76940 100644
--- a/installer/test.php
+++ b/installer/test.php
@@ -167,7 +167,7 @@ else if ($db_working && $_POST['updatedb']) {
 // 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 6984b49cc..534a65cb9 100644
--- a/program/include/rcube_contacts.php
+++ b/program/include/rcube_contacts.php
@@ -934,8 +934,8 @@ class rcube_contacts extends rcube_addressbook
                 $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++;
         }
-- 
cgit v1.2.3