From be9aacaa5296dfca63fb3a01c2dc52538d1546aa Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Sat, 17 Nov 2012 12:31:31 -0500
Subject: [PATCH] Bring back lost localization for the about page
---
program/include/rcube_contacts.php | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/program/include/rcube_contacts.php b/program/include/rcube_contacts.php
index 7edd099..e4500c7 100644
--- a/program/include/rcube_contacts.php
+++ b/program/include/rcube_contacts.php
@@ -23,7 +23,8 @@
/**
* Model class for the local address book database
*
- * @package Addressbook
+ * @package Framework
+ * @subpackage Addressbook
*/
class rcube_contacts extends rcube_addressbook
{
@@ -36,7 +37,7 @@
/**
* Store database connection.
*
- * @var rcube_mdb2
+ * @var rcube_db
*/
private $db = null;
private $user_id = 0;
@@ -934,7 +935,9 @@
$contact_id
);
- if (!$this->db->db_error)
+ if ($error = $this->db->is_error())
+ $this->set_error(self::ERROR_SAVING, $error);
+ else
$added++;
}
@@ -988,9 +991,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