From d5127b14bef08edeeec60da991723dc48b260dbb Mon Sep 17 00:00:00 2001 From: Thomas Tanghus <thomas@tanghus.net> Date: Thu, 23 Aug 2012 14:44:28 +0200 Subject: [PATCH] Return newly created addressbook. --- apps/contacts/lib/addressbook.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php index 92c5f4da3a..810c681fe5 100644 --- a/apps/contacts/lib/addressbook.php +++ b/apps/contacts/lib/addressbook.php @@ -66,7 +66,8 @@ class OC_Contacts_Addressbook { } $addressbooks = array_merge($addressbooks, OCP\Share::getItemsSharedWith('addressbook', OC_Share_Backend_Addressbook::FORMAT_ADDRESSBOOKS)); if(!$active && !count($addressbooks)) { - self::addDefault($uid); + $id = self::addDefault($uid); + return array(self::find($id),); } return $addressbooks; } @@ -139,7 +140,7 @@ class OC_Contacts_Addressbook { } return $id; } - + /** * @brief Creates a new address book * @param string $userid @@ -290,7 +291,7 @@ class OC_Contacts_Addressbook { OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', exception for '.$id.': '.$e->getMessage(), OCP\Util::ERROR); return false; } - + $cards = OC_Contacts_VCard::all($id); foreach($cards as $card){ OC_Contacts_VCard::delete($card['id']); -- GitLab