diff options
Diffstat (limited to 'apps/contacts/index.php')
| -rw-r--r-- | apps/contacts/index.php | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/apps/contacts/index.php b/apps/contacts/index.php index 917335fb68b..29c9e4f1219 100644 --- a/apps/contacts/index.php +++ b/apps/contacts/index.php @@ -69,15 +69,15 @@ foreach( $openaddressbooks as $addressbook ){ } usort($contacts,'contacts_namesort'); -$details = array(); -if( !is_null($id) || count($contacts)){ +$details = array(); +if( !is_null($id)/* || count($contacts)*/){ if(is_null($id)) $id = $contacts[0]['id']; - $contact = OC_Contacts_VCard::find($id); - $vcard = OC_Contacts_VCard::parse($contact['carddata']); + $vcard = OC_Contacts_App::getContactVCard($id); $details = OC_Contacts_VCard::structureContact($vcard); } +<<<<<<< HEAD // Include Style and Script OC_Util::addScript('contacts','interface'); OC_Util::addStyle('contacts','styles'); @@ -88,6 +88,10 @@ OC_Util::addStyle('', 'jquery.multiselect'); $l10n = new OC_L10N('contacts'); $adr_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'ADR'); $phone_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'TEL'); +======= +$adr_types = OC_Contacts_App::getTypesOfProperty('ADR'); +$phone_types = OC_Contacts_App::getTypesOfProperty('TEL'); +>>>>>>> eeaf539a4414e3081b6f6652167363a3221a1973 // Process the template $tmpl = new OC_Template( 'contacts', 'index', 'user' ); |