aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-08-21 15:43:03 +0200
committerMario Vavti <mario@mariovavti.com>2016-08-21 15:43:03 +0200
commit4f62d7a78f63e4bae136f52d70d0af906d997b78 (patch)
tree9b66c3bd585bbaccdb44ee0e1a91050c21aeed6e /Zotlabs
parente4244c0cac301c63e5f69cde24c889e15500d89e (diff)
downloadvolse-hubzilla-4f62d7a78f63e4bae136f52d70d0af906d997b78.tar.gz
volse-hubzilla-4f62d7a78f63e4bae136f52d70d0af906d997b78.tar.bz2
volse-hubzilla-4f62d7a78f63e4bae136f52d70d0af906d997b78.zip
move jotnets to jot and some cleanup (mostly whitespace)
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Channel.php3
-rw-r--r--Zotlabs/Module/Display.php3
-rw-r--r--Zotlabs/Module/Network.php5
-rw-r--r--Zotlabs/Module/Rpost.php3
4 files changed, 9 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 525f053de..e7662e49a 100644
--- a/Zotlabs/Module/Rpost.php
+++ b/Zotlabs/Module/Rpost.php
@@ -126,7 +126,8 @@ class Rpost extends \Zotlabs\Web\Controller {
'source' => ((x($_REQUEST,'source')) ? strip_tags($_REQUEST['source']) : ''),
'return_path' => 'rpost/return',
'bbco_autocomplete' => 'bbcode',
- 'bbcode' => true
+ 'bbcode' => true,
+ 'jotnets' => true
);
$editor = status_editor($a,$x);