aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-10 14:59:24 -0800
committerfriendica <info@friendica.com>2015-01-10 14:59:24 -0800
commit4c31598555cfbe5623c3cfa73b41cded7a6981f5 (patch)
tree74281efdefcc5587f282e8e298b742094952f59c
parentdf0f67843ea1fb492091806168d556d5a0c540c6 (diff)
parent10102ac2ac4d5b02012a9794e23656717ab05556 (diff)
downloadvolse-hubzilla-4c31598555cfbe5623c3cfa73b41cded7a6981f5.tar.gz
volse-hubzilla-4c31598555cfbe5623c3cfa73b41cded7a6981f5.tar.bz2
volse-hubzilla-4c31598555cfbe5623c3cfa73b41cded7a6981f5.zip
Merge branch 'master' into trinidad
-rw-r--r--include/zot.php3
-rw-r--r--mod/connedit.php4
2 files changed, 5 insertions, 2 deletions
diff --git a/include/zot.php b/include/zot.php
index c21ad8a3f..384769d61 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -2368,6 +2368,9 @@ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) {
logger('build_sync_packet');
+ if($packet)
+ logger('packet: ' . print_r($packet,true),LOGGER_DATA);
+
if(! $uid)
$uid = local_user();
diff --git a/mod/connedit.php b/mod/connedit.php
index abab0416e..7a38187dd 100644
--- a/mod/connedit.php
+++ b/mod/connedit.php
@@ -241,7 +241,7 @@ function connedit_clone(&$a) {
unset($clone['abook_account']);
unset($clone['abook_channel']);
- build_sync_packet(0 /* use the current local_user */, array(array('abook' => array($clone))));
+ build_sync_packet(0 /* use the current local_user */, array('abook' => array($clone)));
}
/* @brief Generate content of connection edit page
@@ -402,7 +402,7 @@ function connedit_content(&$a) {
contact_remove(local_user(), $orig_record[0]['abook_id']);
build_sync_packet(0 /* use the current local_user */,
- array(array('abook' => array(
+ array('abook' => array(array(
'abook_xchan' => $orig_record[0]['abook_xchan'],
'entry_deleted' => true))
)