1
0
mirror of https://github.com/owncloudarchive/contacts.git synced 2025-02-07 01:54:16 +01:00

Merge branch 'vcategories_db' into contacts_rework

This commit is contained in:
Thomas Tanghus 2012-09-17 02:05:58 +02:00
commit 11d9539a29
2 changed files with 3 additions and 3 deletions

View File

@ -223,10 +223,10 @@ class OC_Contacts_App {
*/ */
public static function getVCategories() { public static function getVCategories() {
if (is_null(self::$categories)) { if (is_null(self::$categories)) {
if(OC_VCategories::isEmpty('contacts')) { if(OC_VCategories::isEmpty('contact')) {
self::scanCategories(); self::scanCategories();
} }
self::$categories = new OC_VCategories('contacts', self::$categories = new OC_VCategories('contact',
null, null,
self::getDefaultCategories()); self::getDefaultCategories());
} }

View File

@ -551,7 +551,7 @@ class OC_Contacts_VCard {
) )
); );
} }
OC_Contacts_App::getVCategories()->purgeObject($id);
return true; return true;
} }