rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-11-29 11:24:11 +01:00
Code Issues Releases Activity

Merge branch 'master' of github.com:owncloud/apps into contacts_rework

Browse Source 
Conflicts:
	contacts/ajax/categories/categoriesfor.php
	contacts/ajax/contact/saveproperty.php
	contacts/js/contacts.js
	contacts/lib/vcard.php
This commit is contained in:
Thomas Tanghus 2012-11-14 01:11:42 +01:00
commit b83796e251
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ajax/categories/categoriesfor.php
View File

@ -17,6 +17,7 @@ if(is_null($id)) {
'message' => OCA\Contacts\App::$l10n->t('No ID provided')))); 'message' => OCA\Contacts\App::$l10n->t('No ID provided'))));
exit(); exit();
} }
$vcard = OCA\Contacts\App::getContactVCard( $id ); $vcard = OCA\Contacts\App::getContactVCard( $id );
foreach($vcard->children as $property) { foreach($vcard->children as $property) {
if($property->name == 'CATEGORIES') { if($property->name == 'CATEGORIES') {

2
ajax/categories/delete.php
View File

@ -41,7 +41,7 @@ foreach($contacts as $contact) {
debug('Before delete: '.print_r($categories, true)); debug('Before delete: '.print_r($categories, true));
$catman = new OC_VCategories('contacts'); $catman = new OC_VCategories('contact');
$catman->delete($categories, $cards); $catman->delete($categories, $cards);
debug('After delete: '.print_r($catman->categories(), true)); debug('After delete: '.print_r($catman->categories(), true));
OCA\Contacts\VCard::updateDataByID($cards); OCA\Contacts\VCard::updateDataByID($cards);

1
lib/vcard.php
View File

@ -606,6 +606,7 @@ class VCard {
) )
); );
} }
OC_Contacts_App::getVCategories()->purgeObject($id);
App::updateDBProperties($id); App::updateDBProperties($id);
App::getVCategories()->purgeObject($id); App::getVCategories()->purgeObject($id);