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'
---
program/include/rcube_contacts.php | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/program/include/rcube_contacts.php b/program/include/rcube_contacts.php
index f7fc651..534a65c 100644
--- a/program/include/rcube_contacts.php
+++ b/program/include/rcube_contacts.php
@@ -36,7 +36,7 @@
/**
* Store database connection.
*
- * @var rcube_mdb2
+ * @var rcube_db
*/
private $db = null;
private $user_id = 0;
@@ -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++;
}
@@ -990,9 +990,10 @@
$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;
}
--
Gitblit v1.9.1