diff options
author | redmatrix <git@macgirvin.com> | 2016-04-10 17:03:30 -0700 |
---|---|---|
committer | redmatrix <git@macgirvin.com> | 2016-04-10 17:03:30 -0700 |
commit | e9f1bac062bc72f118c7633cf683b21a000d089e (patch) | |
tree | f26c59e6399deb278b1659534d7c6ea75a397b95 /mod/editblock.php | |
parent | abfbe9c9375c7505e0422b8adc1d9d5426d7df1a (diff) | |
parent | 46ed79c87a23f442eadc4244b62a6f85f3d431e8 (diff) | |
download | volse-hubzilla-e9f1bac062bc72f118c7633cf683b21a000d089e.tar.gz volse-hubzilla-e9f1bac062bc72f118c7633cf683b21a000d089e.tar.bz2 volse-hubzilla-e9f1bac062bc72f118c7633cf683b21a000d089e.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'mod/editblock.php')
-rw-r--r-- | mod/editblock.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mod/editblock.php b/mod/editblock.php index 35922e483..214c495dd 100644 --- a/mod/editblock.php +++ b/mod/editblock.php @@ -115,7 +115,8 @@ function editblock_content(&$a) { '$ispublic' => ' ', // t('Visible to <strong>everybody</strong>'), '$geotag' => '', '$nickname' => $channel['channel_address'], - '$confirmdelete' => t('Delete block?') + '$confirmdelete' => t('Delete block?'), + '$bbco_autocomplete'=> (($mimetype == 'text/bbcode') ? 'bbcode' : 'comanche-block') )); $tpl = get_markup_template("jot.tpl"); @@ -174,6 +175,7 @@ function editblock_content(&$a) { '$defexpire' => '', '$feature_expire' => false, '$expires' => t('Set expiration date'), + '$bbcode' => (($mimetype == 'text/bbcode') ? true : false) )); $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( |