diff options
| author | redmatrix <git@macgirvin.com> | 2016-08-21 16:33:59 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-08-21 16:33:59 -0700 |
| commit | b6a545b4a279061c7e786dbfe4d63679bfe18e07 (patch) | |
| tree | 7da62eb162b2c26116923bf5995d6499f840b4c8 /Zotlabs | |
| parent | 4d34d9c03269ea9b8ca038a87f5351cfe4dbeff1 (diff) | |
| parent | 4f62d7a78f63e4bae136f52d70d0af906d997b78 (diff) | |
| download | volse-hubzilla-b6a545b4a279061c7e786dbfe4d63679bfe18e07.tar.gz volse-hubzilla-b6a545b4a279061c7e786dbfe4d63679bfe18e07.tar.bz2 volse-hubzilla-b6a545b4a279061c7e786dbfe4d63679bfe18e07.zip | |
Merge branch 'dev' of https://github.com/git-marijus/hubzilla into git-marijus-dev
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Channel.php | 3 | ||||
| -rw-r--r-- | Zotlabs/Module/Display.php | 3 | ||||
| -rw-r--r-- | Zotlabs/Module/Network.php | 5 | ||||
| -rw-r--r-- | Zotlabs/Module/Rpost.php | 4 |
4 files changed, 10 insertions, 5 deletions
diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php index 59cb9f06c..be65354a9 100644 --- a/Zotlabs/Module/Channel.php +++ b/Zotlabs/Module/Channel.php @@ -140,7 +140,8 @@ class Channel extends \Zotlabs\Web\Controller { 'profile_uid' => \App::$profile['profile_uid'], 'editor_autocomplete' => true, 'bbco_autocomplete' => 'bbcode', - 'bbcode' => true + 'bbcode' => true, + 'jotnets' => true ); $o .= status_editor($a,$x); diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index 35ed0c894..e9441bbdf 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -73,7 +73,8 @@ class Display extends \Zotlabs\Web\Controller { 'expanded' => true, 'editor_autocomplete' => true, 'bbco_autocomplete' => 'bbcode', - 'bbcode' => true + 'bbcode' => true, + 'jotnets' => true ); $o = '<div id="jot-popup">'; 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; diff --git a/Zotlabs/Module/Rpost.php b/Zotlabs/Module/Rpost.php index 28a1f1bb0..1349cd1c5 100644 --- a/Zotlabs/Module/Rpost.php +++ b/Zotlabs/Module/Rpost.php @@ -127,7 +127,9 @@ class Rpost extends \Zotlabs\Web\Controller { 'return_path' => 'rpost/return', 'bbco_autocomplete' => 'bbcode', 'editor_autocomplete'=> true, - 'bbcode' => true + 'bbcode' => true, + 'jotnets' => true + ); $editor = status_editor($a,$x); |