diff options
| author | Mario Vavti <mario@mariovavti.com> | 2021-10-04 13:31:30 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2021-10-04 13:31:30 +0200 |
| commit | 2e26a13f810791e909b5c35db82ffe33aaee8e57 (patch) | |
| tree | 5f13b80bac00b3de7a493f46b28bb555b5a1acd8 | |
| parent | 404ebd4d5e7a04f3e3a48bcf95b80774a96a4344 (diff) | |
| parent | 11ea7bf0fc7f35cb205e0de40622c88a0bed9f66 (diff) | |
| download | volse-hubzilla-2e26a13f810791e909b5c35db82ffe33aaee8e57.tar.gz volse-hubzilla-2e26a13f810791e909b5c35db82ffe33aaee8e57.tar.bz2 volse-hubzilla-2e26a13f810791e909b5c35db82ffe33aaee8e57.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
| -rw-r--r-- | Zotlabs/Lib/Apps.php | 12 | ||||
| -rw-r--r-- | Zotlabs/Lib/Libsync.php | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php index defdbdb06..ad3ef9ab2 100644 --- a/Zotlabs/Lib/Apps.php +++ b/Zotlabs/Lib/Apps.php @@ -646,10 +646,10 @@ class Apps { ); } if (intval($r[0]['app_system'])) { - Libsync::build_sync_packet($uid, ['sysapp' => $r[0]]); + Libsync::build_sync_packet($uid, ['sysapp' => $r]); } else { - Libsync::build_sync_packet($uid, ['app' => $r[0]]); + Libsync::build_sync_packet($uid, ['app' => $r]); } } } @@ -714,8 +714,12 @@ class Apps { intval($uid) ); } - if(! intval($x[0]['app_system'])) { - Libsync::build_sync_packet($uid,array('app' => $x)); + + if (intval($x[0]['app_system'])) { + Libsync::build_sync_packet($uid, ['sysapp' => $x]); + } + else { + Libsync::build_sync_packet($uid, ['app' => $x]); } } else { diff --git a/Zotlabs/Lib/Libsync.php b/Zotlabs/Lib/Libsync.php index e08f14447..1157428b4 100644 --- a/Zotlabs/Lib/Libsync.php +++ b/Zotlabs/Lib/Libsync.php @@ -247,7 +247,7 @@ class Libsync { sync_apps($channel, $arr['app']); if (array_key_exists('sysapp',$arr) && $arr['sysapp']) { - sync_sysapps($channel,$arr['sysapp']); + sync_sysapps($channel, $arr['sysapp']); } if (array_key_exists('addressbook', $arr) && $arr['addressbook']) |