From bbb1427caabba60e4329d4b3653fbf29d5ddddcc Mon Sep 17 00:00:00 2001 From: thomascube Date: Tue, 19 Apr 2011 20:41:24 +0000 Subject: Gracefully shrug on database errors --- program/include/rcube_mdb2.php | 4 +++- program/include/rcube_user.php | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'program/include') diff --git a/program/include/rcube_mdb2.php b/program/include/rcube_mdb2.php index 36a595098..7675e847f 100644 --- a/program/include/rcube_mdb2.php +++ b/program/include/rcube_mdb2.php @@ -266,7 +266,9 @@ class rcube_mdb2 raise_error(array('code' => 500, 'type' => 'db', 'line' => __LINE__, 'file' => __FILE__, - 'message' => $this->db_error_msg), true, true); + 'message' => $this->db_error_msg), true, false); + + $result = false; } else { $result = $q->execute($params); diff --git a/program/include/rcube_user.php b/program/include/rcube_user.php index 75faf4728..c9936d619 100644 --- a/program/include/rcube_user.php +++ b/program/include/rcube_user.php @@ -288,7 +288,7 @@ class rcube_user // we'll not delete last identity if ($sql_arr['ident_count'] <= 1) - return false; + return -1; $this->db->query( "UPDATE ".get_table_name('identities'). -- cgit v1.2.3