Fix bug oc-413: PHP fatal error in contacts page when no contacts in ownCloud.
This commit is contained in:
parent
660951dc64
commit
b71cf1a4f9
|
@ -43,17 +43,15 @@ if(count($categories) == 0) {
|
||||||
$vcaddressbookids[] = $vcaddressbook['id'];
|
$vcaddressbookids[] = $vcaddressbook['id'];
|
||||||
}
|
}
|
||||||
$vccontacts = OC_Contacts_VCard::all($vcaddressbookids);
|
$vccontacts = OC_Contacts_VCard::all($vcaddressbookids);
|
||||||
if(count($vccontacts) == 0) {
|
if(count($vccontacts) > 0) {
|
||||||
bailOut(OC_Contacts_App::$l10n->t('No contacts found.'));
|
$cards = array();
|
||||||
|
foreach($vccontacts as $vccontact) {
|
||||||
|
$cards[] = $vccontact['carddata'];
|
||||||
|
}
|
||||||
|
|
||||||
|
OC_Contacts_App::$categories->rescan($cards);
|
||||||
|
$categories = OC_Contacts_App::$categories->categories();
|
||||||
}
|
}
|
||||||
|
|
||||||
$cards = array();
|
|
||||||
foreach($vccontacts as $vccontact) {
|
|
||||||
$cards[] = $vccontact['carddata'];
|
|
||||||
}
|
|
||||||
|
|
||||||
OC_Contacts_App::$categories->rescan($cards);
|
|
||||||
$categories = OC_Contacts_App::$categories->categories();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue