From 15442512d249380851aaa7878a541559ee4f6782 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 8 Aug 2012 09:49:43 +0200
Subject: (Again) return error message from is_error()

---
 program/include/rcube_db.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'program')

diff --git a/program/include/rcube_db.php b/program/include/rcube_db.php
index 01abfc8b4..042ca15e4 100644
--- a/program/include/rcube_db.php
+++ b/program/include/rcube_db.php
@@ -268,15 +268,15 @@ class rcube_db
      *
      * @param int $res_id Optional query result identifier
      *
-     * @return boolean True on error, False otherwise
+     * @return string Error message
      */
     public function is_error($res_id = null)
     {
         if ($res_id !== null) {
-            return $this->_get_result($res_id) === false;
+            return $this->_get_result($res_id) === false ? $this->db_error_msg : null;
         }
 
-        return $this->db_error;
+        return $this->db_error ? $this->db_error_msg : null;
     }
 
     /**
-- 
cgit v1.2.3