From 80ca883d4cdf70e74e3a3317d370221193216700 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 5 Aug 2012 03:36:16 +0200
Subject: [PATCH] Correct path to ajax file.
---
apps/contacts/ajax/contact/details.php | 6 +++---
apps/contacts/js/contacts.js | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/apps/contacts/ajax/contact/details.php b/apps/contacts/ajax/contact/details.php
index 27d7611ade..0e07f9ec3d 100644
--- a/apps/contacts/ajax/contact/details.php
+++ b/apps/contacts/ajax/contact/details.php
@@ -19,8 +19,8 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*
*/
-
-require_once 'loghandler.php';
+
+require_once __DIR__.'/../loghandler.php';
// Check if we are a user
OCP\JSON::checkLoggedIn();
@@ -31,7 +31,7 @@ if(is_null($id)) {
bailOut(OC_Contacts_App::$l10n->t('Missing ID'));
}
$card = OC_Contacts_VCard::find($id);
-$vcard = OC_Contacts_App::getContactVCard( $id );
+$vcard = OC_VObject::parse($card['carddata']);
if(is_null($vcard)) {
bailOut(OC_Contacts_App::$l10n->t('Error parsing VCard for ID: "'.$id.'"'));
}
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 0b4a3c0a54..9aec02557f 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -348,7 +348,7 @@ OC.Contacts={
console.log('newid: ' + newid + ' bookid: ' +bookid);
var localLoadContact = function(newid, bookid) {
if($('.contacts li').length > 0) {
- $.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':newid},function(jsondata){
+ $.getJSON(OC.filePath('contacts', 'ajax', 'contact/details.php'),{'id':newid},function(jsondata){
if(jsondata.status == 'success'){
if(bookid == 'unknown') {
bookid = jsondata.data.addressbookid;
@@ -1783,7 +1783,7 @@ $(document).ready(function(){
$('#contacts h3[data-id="'+bookid+'"]').addClass('active');
}
}
- $.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':id},function(jsondata){
+ $.getJSON(OC.filePath('contacts', 'ajax', 'contact/details.php'),{'id':id},function(jsondata){
if(jsondata.status == 'success'){
OC.Contacts.Card.loadContact(jsondata.data, bookid);
}
--
GitLab