diff options
| author | redmatrix <git@macgirvin.com> | 2016-04-10 17:03:30 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-04-10 17:03:30 -0700 |
| commit | e9f1bac062bc72f118c7633cf683b21a000d089e (patch) | |
| tree | f26c59e6399deb278b1659534d7c6ea75a397b95 /mod/channel.php | |
| parent | abfbe9c9375c7505e0422b8adc1d9d5426d7df1a (diff) | |
| parent | 46ed79c87a23f442eadc4244b62a6f85f3d431e8 (diff) | |
| download | volse-hubzilla-e9f1bac062bc72f118c7633cf683b21a000d089e.tar.gz volse-hubzilla-e9f1bac062bc72f118c7633cf683b21a000d089e.tar.bz2 volse-hubzilla-e9f1bac062bc72f118c7633cf683b21a000d089e.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'mod/channel.php')
| -rw-r--r-- | mod/channel.php | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/mod/channel.php b/mod/channel.php index 88c420366..2ef911bbb 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -124,15 +124,18 @@ function channel_content(&$a, $update = 0, $load = false) { $x = array( 'is_owner' => $is_owner, - 'allow_location' => ((($is_owner || $observer) && (intval(get_pconfig(App::$profile['profile_uid'],'system','use_browser_location')))) ? true : false), - 'default_location' => (($is_owner) ? App::$profile['channel_location'] : ''), - 'nickname' => App::$profile['channel_address'], - 'lockstate' => (((strlen(App::$profile['channel_allow_cid'])) || (strlen(App::$profile['channel_allow_gid'])) || (strlen(App::$profile['channel_deny_cid'])) || (strlen(App::$profile['channel_deny_gid']))) ? 'lock' : 'unlock'), - 'acl' => (($is_owner) ? populate_acl($channel_acl,true,((App::$profile['channel_r_stream'] & PERMS_PUBLIC) ? t('Public') : '')) : ''), + 'allow_location' => ((($is_owner || $observer) && (intval(get_pconfig(App::$profile['profile_uid'],'system','use_browser_location')))) ? true : false), + 'default_location' => (($is_owner) ? App::$profile['channel_location'] : ''), + 'nickname' => App::$profile['channel_address'], + 'lockstate' => (((strlen(App::$profile['channel_allow_cid'])) || (strlen(App::$profile['channel_allow_gid'])) || (strlen(App::$profile['channel_deny_cid'])) || (strlen(App::$profile['channel_deny_gid']))) ? 'lock' : 'unlock'), + 'acl' => (($is_owner) ? populate_acl($channel_acl,true,((App::$profile['channel_r_stream'] & PERMS_PUBLIC) ? t('Public') : '')) : ''), 'showacl' => (($is_owner) ? 'yes' : ''), - 'bang' => '', + 'bang' => '', 'visitor' => (($is_owner || $observer) ? true : false), - 'profile_uid' => App::$profile['profile_uid'] + 'profile_uid' => App::$profile['profile_uid'], + 'editor_autocomplete' => true, + 'bbco_autocomplete' => 'bbcode', + 'bbcode' => true ); $o .= status_editor($a,$x); |