diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2012-03-08 02:55:48 +0100 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2012-03-08 02:55:48 +0100 |
| commit | a33a62bf601e4dc91a42d1d0d983d7fa2e40dacb (patch) | |
| tree | 09f7ea083936c8ce3e73908e54929b1d151de3f3 /apps/contacts/lib/vcard.php | |
| parent | ae7aab2d6e727f9daf683056001a982aad242c93 (diff) | |
| parent | 340320625e8da301e4c03752143db6d4837ca545 (diff) | |
| download | nextcloud-server-a33a62bf601e4dc91a42d1d0d983d7fa2e40dacb.tar.gz nextcloud-server-a33a62bf601e4dc91a42d1d0d983d7fa2e40dacb.zip | |
Merge branch 'vcategories' of gitorious.org:owncloud/owncloud into vcategories
Conflicts:
apps/contacts/lib/vcard.php
apps/contacts/templates/part.contact.php
Diffstat (limited to 'apps/contacts/lib/vcard.php')
| -rw-r--r-- | apps/contacts/lib/vcard.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php index 50370370898..a7e1817d7c8 100644 --- a/apps/contacts/lib/vcard.php +++ b/apps/contacts/lib/vcard.php @@ -306,6 +306,8 @@ class OC_Contacts_VCard{ return false; } + OC_Contacts_App::$categories->loadFromVObject($card); + $fn = $card->getAsString('FN'); if (empty($fn)) { $fn = null; |