diff options
| author | zottel <github@zottel.net> | 2016-08-10 13:49:48 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2016-08-10 13:49:48 +0200 |
| commit | 8706cbe1c413ed8fcfb7dcb35c7b319d2d1116bb (patch) | |
| tree | 499ab4cac571c35f6d0758f157ed85af46c8b57c /include/zot.php | |
| parent | 6ba142fd33a74a7bdb4f3dfc8c0c0f507c293a2e (diff) | |
| parent | 7a557d31e026705fc3bd2d4f39c4c679449cef56 (diff) | |
| download | volse-hubzilla-8706cbe1c413ed8fcfb7dcb35c7b319d2d1116bb.tar.gz volse-hubzilla-8706cbe1c413ed8fcfb7dcb35c7b319d2d1116bb.tar.bz2 volse-hubzilla-8706cbe1c413ed8fcfb7dcb35c7b319d2d1116bb.zip | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'include/zot.php')
| -rw-r--r-- | include/zot.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/zot.php b/include/zot.php index 73d9ef950..4e443652f 100644 --- a/include/zot.php +++ b/include/zot.php @@ -2251,7 +2251,7 @@ function check_location_move($sender_hash,$locations) { if(! $locations) return; - if(! UNO) + if(get_config('system','server_role') !== 'basic') return; if(count($locations) != 1) @@ -2929,7 +2929,7 @@ function import_site($arr, $pubkey) { */ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) { - if(UNO) + if(get_config('system','server_role') === 'basic') return; logger('build_sync_packet'); @@ -3077,7 +3077,7 @@ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) { */ function process_channel_sync_delivery($sender, $arr, $deliveries) { - if(UNO) + if(get_config('system','server_role') === 'basic') return; require_once('include/import.php'); |