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/conversation.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/conversation.php')
| -rw-r--r-- | include/conversation.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php index 1efca37f3..b53498d20 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -802,6 +802,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $ continue; } + $item['pagedrop'] = $page_dropping; if($item['id'] == $item['parent']) { @@ -1253,6 +1254,10 @@ function status_editor($a, $x, $popup = false) { '$visitor' => $x['visitor'], '$lockstate' => $x['lockstate'], '$acl' => $x['acl'], + '$allow_cid' => acl2json($x['permissions']['allow_cid']), + '$allow_gid' => acl2json($x['permissions']['allow_gid']), + '$deny_cid' => acl2json($x['permissions']['deny_cid']), + '$deny_gid' => acl2json($x['permissions']['deny_gid']), '$mimeselect' => $mimeselect, '$layoutselect' => $layoutselect, '$showacl' => ((array_key_exists('showacl', $x)) ? $x['showacl'] : true), @@ -1705,7 +1710,7 @@ function profile_tabs($a, $is_owner = false, $nickname = null){ ); } - if(feature_enabled($uid,'wiki') && (! UNO)) { + if(feature_enabled($uid,'wiki') && (get_config('system','server_role') !== 'basic')) { $tabs[] = array( 'label' => t('Wiki'), 'url' => z_root() . '/wiki/' . $nickname, |