From 029f7a157da4be15302b3eaf40232c110d27bcf1 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 8 Dec 2013 09:39:33 +0100
Subject: Clarify update() result description, return boolean when ID didn't
 change

---
 program/lib/Roundcube/rcube_addressbook.php | 3 ++-
 program/lib/Roundcube/rcube_contacts.php    | 9 +++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'program/lib')

diff --git a/program/lib/Roundcube/rcube_addressbook.php b/program/lib/Roundcube/rcube_addressbook.php
index ed6ffcd28..4d9fa3db1 100644
--- a/program/lib/Roundcube/rcube_addressbook.php
+++ b/program/lib/Roundcube/rcube_addressbook.php
@@ -281,7 +281,8 @@ abstract class rcube_addressbook
      * @param array Assoziative array with save data
      *  Keys:   Field name with optional section in the form FIELD:SECTION
      *  Values: Field value. Can be either a string or an array of strings for multiple values
-     * @return boolean True on success, False on error
+     *
+     * @return mixed On success if ID has been changed returns ID, otherwise True, False on error
      */
     function update($id, $save_cols)
     {
diff --git a/program/lib/Roundcube/rcube_contacts.php b/program/lib/Roundcube/rcube_contacts.php
index ee53f44ed..d215760cf 100644
--- a/program/lib/Roundcube/rcube_contacts.php
+++ b/program/lib/Roundcube/rcube_contacts.php
@@ -626,7 +626,7 @@ class rcube_contacts extends rcube_addressbook
             }
         }
 
-        $save_data = $this->convert_save_data($save_data);
+        $save_data     = $this->convert_save_data($save_data);
         $a_insert_cols = $a_insert_values = array();
 
         foreach ($save_data as $col => $value) {
@@ -655,13 +655,14 @@ class rcube_contacts extends rcube_addressbook
      *
      * @param mixed Record identifier
      * @param array Assoziative array with save data
+     *
      * @return boolean True on success, False on error
      */
     function update($id, $save_cols)
     {
-        $updated = false;
+        $updated   = false;
         $write_sql = array();
-        $record = $this->get_record($id, true);
+        $record    = $this->get_record($id, true);
         $save_cols = $this->convert_save_data($save_cols, $record);
 
         foreach ($save_cols as $col => $value) {
@@ -683,7 +684,7 @@ class rcube_contacts extends rcube_addressbook
             $this->result = null;  // clear current result (from get_record())
         }
 
-        return $updated;
+        return $updated ? true : false;
     }
 
 
-- 
cgit v1.2.3