diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-08-23 06:57:10 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-08-23 06:57:10 -0400 |
| commit | 420aa4bc44a2fdf707b3964582258809f978ea2d (patch) | |
| tree | c6def258a9311d513d6e1e89918c2ec0d17114f7 /Zotlabs/Module/Network.php | |
| parent | 305e0538d293ff4ad72f30b11998ae3b06efa4ea (diff) | |
| parent | 1e6a491400eaa01aeb2991d4b38e0255499d8b67 (diff) | |
| download | volse-hubzilla-420aa4bc44a2fdf707b3964582258809f978ea2d.tar.gz volse-hubzilla-420aa4bc44a2fdf707b3964582258809f978ea2d.tar.bz2 volse-hubzilla-420aa4bc44a2fdf707b3964582258809f978ea2d.zip | |
Merge remote-tracking branch 'upstream/dev' into website-export
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; |