diff options
| author | friendica <info@friendica.com> | 2015-01-07 14:39:09 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-07 14:39:09 -0800 |
| commit | 0657195125675700eeb9bcd1bc92f4299cac0304 (patch) | |
| tree | 2e6d2df8fd42b289b947a16f0c5f0009a2c98043 /include | |
| parent | a1e5a661fa8f87793cab0fe9c34f507dafb65d99 (diff) | |
| parent | 087d6744fcd0c77cf3415b4ce6eaf50cdb63b4ef (diff) | |
| download | volse-hubzilla-0657195125675700eeb9bcd1bc92f4299cac0304.tar.gz volse-hubzilla-0657195125675700eeb9bcd1bc92f4299cac0304.tar.bz2 volse-hubzilla-0657195125675700eeb9bcd1bc92f4299cac0304.zip | |
Merge branch 'master' into trinidad
Diffstat (limited to 'include')
| -rw-r--r-- | include/Contact.php | 2 | ||||
| -rw-r--r-- | include/nav.php | 10 |
2 files changed, 3 insertions, 9 deletions
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", 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> |