aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-04-18 19:17:20 -0700
committerredmatrix <git@macgirvin.com>2016-04-18 19:17:20 -0700
commit2a61817bad96526994c0499f1fc0a843a9cc9405 (patch)
tree21568a2c5b7dedc24066513c9d7b7aef8ad5b807 /mod
parent1698732cffab2f625c16a1d8d1227497a0965d43 (diff)
parent094d4cc325587428a2cce2f0412d2fd97ac43e29 (diff)
downloadvolse-hubzilla-2a61817bad96526994c0499f1fc0a843a9cc9405.tar.gz
volse-hubzilla-2a61817bad96526994c0499f1fc0a843a9cc9405.tar.bz2
volse-hubzilla-2a61817bad96526994c0499f1fc0a843a9cc9405.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'mod')
-rw-r--r--mod/editpost.php1
-rw-r--r--mod/rpost.php4
2 files changed, 4 insertions, 1 deletions
diff --git a/mod/editpost.php b/mod/editpost.php
index 397254a48..ae77e5973 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -160,6 +160,7 @@ function editpost_content(&$a) {
'$cipher' => $cipher,
'$expiryModalOK' => t('OK'),
'$expiryModalCANCEL' => t('Cancel'),
+ '$bbcode' => true
));
$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
diff --git a/mod/rpost.php b/mod/rpost.php
index 69b8c7b7e..3e036cac6 100644
--- a/mod/rpost.php
+++ b/mod/rpost.php
@@ -119,7 +119,9 @@ function rpost_content(&$a) {
'body' => $_REQUEST['body'],
'attachment' => $_REQUEST['attachment'],
'source' => ((x($_REQUEST,'source')) ? strip_tags($_REQUEST['source']) : ''),
- 'return_path' => 'rpost/return'
+ 'return_path' => 'rpost/return',
+ 'bbco_autocomplete' => 'bbcode',
+ 'bbcode' => true
);
$editor = status_editor($a,$x);