diff options
| author | redmatrix <git@macgirvin.com> | 2016-04-19 13:04:59 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-04-19 13:04:59 -0700 |
| commit | dd7fdf0c2b8e465703cb9b7d4e9d231c69c55d7c (patch) | |
| tree | 64e8a6093a4c1465c2e012a97d754cbc3ad75b53 | |
| parent | bb7b756974b342e7b6dbac6f8a77eb57d17c8cba (diff) | |
| parent | a49fa5f87c0c46a7023113b454fb59a001839fd8 (diff) | |
| download | volse-hubzilla-dd7fdf0c2b8e465703cb9b7d4e9d231c69c55d7c.tar.gz volse-hubzilla-dd7fdf0c2b8e465703cb9b7d4e9d231c69c55d7c.tar.bz2 volse-hubzilla-dd7fdf0c2b8e465703cb9b7d4e9d231c69c55d7c.zip | |
Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge
| -rw-r--r-- | mod/editpost.php | 1 | ||||
| -rw-r--r-- | mod/rpost.php | 4 |
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); |