diff options
| author | Jakob Sack <kde@jakobsack.de> | 2011-08-11 00:27:55 +0400 |
|---|---|---|
| committer | Jakob Sack <kde@jakobsack.de> | 2011-08-11 00:27:55 +0400 |
| commit | 5324d6f7df91d4284b822debe49ef09bdc140d1a (patch) | |
| tree | adfc495be99fc0ecedf4b63fb2556885c84345f1 /apps/contacts | |
| parent | ec31a29b3c0add4ab4adf1ba089282b7024b1eb1 (diff) | |
Small fixes
Diffstat (limited to 'apps/contacts')
| -rw-r--r-- | apps/contacts/carddav.php | 4 | ||||
| -rw-r--r-- | apps/contacts/lib/addressbook.php | 4 | ||||
| -rw-r--r-- | apps/contacts/templates/index.php | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/apps/contacts/carddav.php b/apps/contacts/carddav.php index 581bf4a717b..77b3c105deb 100644 --- a/apps/contacts/carddav.php +++ b/apps/contacts/carddav.php @@ -32,8 +32,8 @@ $carddavBackend = new OC_Connector_Sabre_CardDAV(); // Root nodes $nodes = array( - new Sabre_DAVACL_PrincipalCollection($principalBackend), - new Sabre_CardDAV_AddressBookRoot($principalBackend, $carddavBackend), + new Sabre_DAVACL_PrincipalCollection($principalBackend), + new Sabre_CardDAV_AddressBookRoot($principalBackend, $carddavBackend), ); // Fire up server diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php index 8b91cdbd6f5..bab260840d9 100644 --- a/apps/contacts/lib/addressbook.php +++ b/apps/contacts/lib/addressbook.php @@ -120,10 +120,10 @@ class OC_Contacts_Addressbook{ } public static function deleteAddressbook($id){ - $stmt = OC_DB::prepare( 'DELETE FROM *PREFIX*contacts_cards WHERE id = ?' ); + $stmt = OC_DB::prepare( 'DELETE FROM *PREFIX*contacts_addressbooks WHERE id = ?' ); $stmt->execute(array($id)); - $stmt = OC_DB::prepare( 'DELETE FROM *PREFIX*contacts_addressbooks WHERE addressbookid = ?' ); + $stmt = OC_DB::prepare( 'DELETE FROM *PREFIX*contacts_cards WHERE addressbookid = ?' ); $stmt->execute(array($id)); return true; diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php index ea76621674a..02b9d976cc4 100644 --- a/apps/contacts/templates/index.php +++ b/apps/contacts/templates/index.php @@ -13,5 +13,5 @@ OC_Util::addStyle('contacts','styles'); <?php echo $this->inc("part.details"); ?> </div> <?php if(count($_['addressbooks']) == 1 ): ?> - <?php echo $l->t('The path to this addressbook is %s', array(OC::$WEBROOT.'/apps/contacts/carddav.php/addressbooks/'.$_['addressbooks'][0]['uri'])); ?> + <?php echo $l->t('The path to this addressbook is %s', array(OC::$WEBROOT.'/apps/contacts/carddav.php/addressbooks/'.OC_User::getUser().'/'.$_['addressbooks'][0]['uri'])); ?> <?php endif; ?> |