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:
commit
11d9539a29
@ -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());
|
||||||
}
|
}
|
||||||
|
@ -551,7 +551,7 @@ class OC_Contacts_VCard {
|
|||||||
)
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
OC_Contacts_App::getVCategories()->purgeObject($id);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user