Merge branch 'vcategories' of gitorious.org:owncloud/owncloud into vcategories

Conflicts:
	apps/contacts/lib/vcard.php
	apps/contacts/templates/part.contact.php

2 files changed, 6 insertions, 0 deletions

diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php
index 1fa441475d2..cc33c733007 100644
--- a/apps/contacts/lib/app.php
+++ b/apps/contacts/lib/app.php
@@ -155,6 +155,10 @@ class OC_Contacts_App {
 		}
 	}
 
+	public static function getCategories() {
+		return self::$categories->categories();
+	}
+
 	public static function setLastModifiedHeader($contact) {
 		$rev = $contact->getAsString('REV');
 		if ($rev) {
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;