diff options
| author | redmatrix <git@macgirvin.com> | 2016-08-21 16:34:42 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-08-21 16:34:42 -0700 |
| commit | 9a057623d6d83ce4b7f40b2479628fa14335c556 (patch) | |
| tree | 7da62eb162b2c26116923bf5995d6499f840b4c8 /Zotlabs/Module/Network.php | |
| parent | 4d34d9c03269ea9b8ca038a87f5351cfe4dbeff1 (diff) | |
| parent | b6a545b4a279061c7e786dbfe4d63679bfe18e07 (diff) | |
| download | volse-hubzilla-9a057623d6d83ce4b7f40b2479628fa14335c556.tar.gz volse-hubzilla-9a057623d6d83ce4b7f40b2479628fa14335c556.tar.bz2 volse-hubzilla-9a057623d6d83ce4b7f40b2479628fa14335c556.zip | |
Merge branch 'git-marijus-dev' into dev
Diffstat (limited to 'Zotlabs/Module/Network.php')
| -rw-r--r-- | Zotlabs/Module/Network.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 0128adc2c..50bb05075 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -159,7 +159,7 @@ class Network extends \Zotlabs\Web\Controller { 'allow_gid' => $channel['channel_allow_gid'], 'deny_cid' => $channel['channel_deny_cid'], 'deny_gid' => $channel['channel_deny_gid'] - ); + ); $private_editing = ((($group || $cid) && (! intval($_GET['pf']))) ? true : false); @@ -176,7 +176,8 @@ class Network extends \Zotlabs\Web\Controller { 'profile_uid' => local_channel(), 'editor_autocomplete' => true, 'bbco_autocomplete' => 'bbcode', - 'bbcode' => true + 'bbcode' => true, + 'jotnets' => true ); if($deftag) $x['pretext'] = $deftag; |