1
0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-12-11 22:24:32 +01:00

Merge branch 'master' into filesystem

This commit is contained in:
Robin Appelman 2012-10-27 15:31:19 +02:00
commit 2d022b19b4
2 changed files with 2 additions and 2 deletions

View File

@ -1655,7 +1655,7 @@ OC.Contacts={
}
var contact = params.data
? $('<li data-id="'+params.data.id+'" data-bookid="'+params.data.addressbookid
+ '" role="button"><a href="'+OC.linkTo('contacts', 'index.php')+'&id='
+ '" role="button"><a href="'+OC.linkTo('contacts', 'index.php')+'?id='
+ params.data.id+'" style="background: url('+OC.filePath('contacts', '', 'thumbnail.php')
+ '?id='+params.data.id+') no-repeat scroll 0% 0% transparent;">'
+ params.data.displayname+'</a></li>')

View File

@ -11,7 +11,7 @@ class OC_Search_Provider_Contacts extends OC_Search_Provider{
$vcards = OC_Contacts_VCard::all($addressbook['id']);
foreach($vcards as $vcard) {
if(substr_count(strtolower($vcard['fullname']), strtolower($query)) > 0) {
$link = OCP\Util::linkTo('contacts', 'index.php').'&id='.urlencode($vcard['id']);
$link = OCP\Util::linkTo('contacts', 'index.php').'?id='.urlencode($vcard['id']);
$results[]=new OC_Search_Result($vcard['fullname'], '', $link, (string)$l->t('Contact'));//$name,$text,$link,$type
}
}