From 34ecbcceea9ae6399f50c6e8718a9f84345136b9 Mon Sep 17 00:00:00 2001
From: Stefan Parviainen <saparvia@caterva.eu>
Date: Wed, 7 Jan 2015 19:39:50 +0100
Subject: Make nav search use textcomplete

---
 include/nav.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'include')

diff --git a/include/nav.php b/include/nav.php
index a9bff4b29..a567f83c5 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -15,15 +15,7 @@ function nav(&$a) {
     $a->page['htmlhead'] .= <<< EOT
 
 <script>$(document).ready(function() {
-    var a;
-    a = $("#nav-search-text").autocomplete({
-        serviceUrl: '$base/acl',
-        minChars: 2,
-        width: 250,
-        id: 'nav-search-text-ac',
-    });
-    a.setOptions({ autoSubmit: true, params: { type: 'x' }});
-
+	$("#nav-search-text").search_autocomplete('$base/acl');
 });
 
 </script>
-- 
cgit v1.2.3


From ce953e2f41c2bf8abdda2584dd84c2bd0175f609 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 7 Jan 2015 14:35:03 -0800
Subject: syncing connections issue, incorrect return_url after deleting
 connection

---
 include/Contact.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'include')

diff --git a/include/Contact.php b/include/Contact.php
index 233798181..4f7a2a19f 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -519,6 +519,8 @@ function contact_remove($channel_id, $abook_id) {
 	if((! $channel_id) || (! $abook_id))
 		return false;
 
+	logger('removing contact ' . $abook_id . ' for channel ' . $channel_id,LOGGER_DEBUG);
+
 	$archive = get_pconfig($channel_id, 'system','archive_removed_contacts');
 	if($archive) {
 		q("update abook set abook_flags = ( abook_flags | %d ) where abook_id = %d and abook_channel = %d",
-- 
cgit v1.2.3