mirror of
https://github.com/owncloudarchive/contacts.git
synced 2024-12-01 13:24:10 +01:00
Merge branch 'vcategories_db' into contacts_rework
This commit is contained in:
commit
e24e2cf9fe
19
lib/app.php
19
lib/app.php
@ -249,21 +249,10 @@ class OC_Contacts_App {
|
||||
*/
|
||||
public static function getDefaultCategories() {
|
||||
return array(
|
||||
(string)self::$l10n->t('Birthday'),
|
||||
(string)self::$l10n->t('Business'),
|
||||
(string)self::$l10n->t('Call'),
|
||||
(string)self::$l10n->t('Clients'),
|
||||
(string)self::$l10n->t('Deliverer'),
|
||||
(string)self::$l10n->t('Holidays'),
|
||||
(string)self::$l10n->t('Ideas'),
|
||||
(string)self::$l10n->t('Journey'),
|
||||
(string)self::$l10n->t('Jubilee'),
|
||||
(string)self::$l10n->t('Meeting'),
|
||||
(string)self::$l10n->t('Other'),
|
||||
(string)self::$l10n->t('Personal'),
|
||||
(string)self::$l10n->t('Projects'),
|
||||
(string)self::$l10n->t('Questions'),
|
||||
(string)self::$l10n->t('Friends'),
|
||||
(string)self::$l10n->t('Family'),
|
||||
(string)self::$l10n->t('Work'),
|
||||
(string)self::$l10n->t('Other'),
|
||||
);
|
||||
}
|
||||
|
||||
@ -277,8 +266,10 @@ class OC_Contacts_App {
|
||||
if(count($vcaddressbooks) > 0) {
|
||||
$vcaddressbookids = array();
|
||||
foreach($vcaddressbooks as $vcaddressbook) {
|
||||
if($vcaddressbook['userid'] === OCP\User::getUser()) {
|
||||
$vcaddressbookids[] = $vcaddressbook['id'];
|
||||
}
|
||||
}
|
||||
$start = 0;
|
||||
$batchsize = 10;
|
||||
$categories = new OC_VCategories('contact');
|
||||
|
Loading…
Reference in New Issue
Block a user