From 5324d6f7df91d4284b822debe49ef09bdc140d1a Mon Sep 17 00:00:00 2001
From: Jakob Sack <kde@jakobsack.de>
Date: Wed, 10 Aug 2011 22:27:55 +0200
Subject: [PATCH] Small fixes
---
apps/contacts/carddav.php | 4 ++--
apps/contacts/lib/addressbook.php | 4 ++--
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 581bf4a717..77b3c105de 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 8b91cdbd6f..bab260840d 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 ea76621674..02b9d976cc 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; ?>
--
GitLab