diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2012-04-09 16:29:56 +0200 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2012-04-09 16:30:58 +0200 |
| commit | 4fda6af725ea775750905983255ab3dc9ceeb2b9 (patch) | |
| tree | a9716bcc83e9859d9d96c47cc75d26f8512331de /apps | |
| parent | 9c247ce874697ed6833c58d21ddecee418ddb525 (diff) | |
| download | nextcloud-server-4fda6af725ea775750905983255ab3dc9ceeb2b9.tar.gz nextcloud-server-4fda6af725ea775750905983255ab3dc9ceeb2b9.zip | |
Contacts: Fix for not being able to add contact to empty/non-existant address book.
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/contacts/ajax/addcontact.php | 2 | ||||
| -rw-r--r-- | apps/contacts/css/contacts.css | 2 | ||||
| -rw-r--r-- | apps/contacts/lib/addressbook.php | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/apps/contacts/ajax/addcontact.php b/apps/contacts/ajax/addcontact.php index 947b35bab51..68da54655ae 100644 --- a/apps/contacts/ajax/addcontact.php +++ b/apps/contacts/ajax/addcontact.php @@ -47,8 +47,6 @@ OC_Contacts_App::getAddressbook( $aid ); // is owner access check $fn = trim($_POST['fn']); $n = trim($_POST['n']); -debug('N: '.$n); -debug('FN: '.$fn); $vcard = new OC_VObject('VCARD'); $vcard->setUID(); diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css index 5d3ebf65fbe..2d207943841 100644 --- a/apps/contacts/css/contacts.css +++ b/apps/contacts/css/contacts.css @@ -56,7 +56,7 @@ dl.form { width: 100%; float: left; clear: right; margin: 0; padding: 0; } .contactpart legend { width:auto; padding:.3em; border:1px solid #ddd; font-weight:bold; cursor:pointer; background:#f8f8f8; color:#555; text-shadow:#fff 0 1px 0; -moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; } #cropbox { margin: auto; } -#contacts_details_photo { border-radius: 0.5em; border: thin solid #bbb; padding: 0.5em; margin: 0.3em; cursor: pointer; background: url(../../../core/img/loading.gif) no-repeat center center; display: block; /* clear: right;*/ } +#contacts_details_photo { border-radius: 0.5em; border: thin solid #bbb; margin: 0.3em; cursor: pointer; background: url(../../../core/img/loading.gif) no-repeat center center; display: block; /* clear: right;*/ } #contacts_details_photo:hover { background: #fff; } /*#contacts_details_photo_progress { margin: 0.3em 0.3em 0.3em 7em; clear: left; }*/ /* Address editor */ diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php index 052c19e55fe..9061fa19140 100644 --- a/apps/contacts/lib/addressbook.php +++ b/apps/contacts/lib/addressbook.php @@ -169,7 +169,7 @@ class OC_Contacts_Addressbook{ $uid = OC_User::getUser(); } $prefbooks = OC_Preferences::getValue($uid,'contacts','openaddressbooks',null); - if(is_null($prefbooks)){ + if(!$prefbooks){ $addressbooks = OC_Contacts_Addressbook::all($uid); if(count($addressbooks) == 0){ OC_Contacts_Addressbook::add($uid,'default','Default Address Book'); |