aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-04-13 16:37:10 -0700
committerredmatrix <git@macgirvin.com>2016-04-13 16:37:10 -0700
commit3f0bb1bb1d94411e8df262c874e9cc67a21fdf6e (patch)
tree53f4ac1e74571a74cb8851e25ccedfb9f4d0e337 /mod
parent9a0b61e4afed94727679eee966afb76e1add2beb (diff)
parentb81291cd5c2d773c73d198fc97da31ecf16af880 (diff)
downloadvolse-hubzilla-3f0bb1bb1d94411e8df262c874e9cc67a21fdf6e.tar.gz
volse-hubzilla-3f0bb1bb1d94411e8df262c874e9cc67a21fdf6e.tar.bz2
volse-hubzilla-3f0bb1bb1d94411e8df262c874e9cc67a21fdf6e.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'mod')
-rw-r--r--mod/editwebpage.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/editwebpage.php b/mod/editwebpage.php
index 9f6df9536..7cf738989 100644
--- a/mod/editwebpage.php
+++ b/mod/editwebpage.php
@@ -151,7 +151,7 @@ function editwebpage_content(&$a) {
'$geotag' => $geotag,
'$nickname' => $channel['channel_address'],
'$confirmdelete' => t('Delete webpage?'),
- '$bbco_autocomplete'=> 'bbcode',
+ '$bbco_autocomplete'=> (($mimetype == 'text/bbcode') ? 'bbcode' : '')
));
$tpl = get_markup_template("jot.tpl");
@@ -216,7 +216,7 @@ function editwebpage_content(&$a) {
'$defexpire' => '',
'$feature_expire' => false,
'$expires' => t('Set expiration date'),
- '$bbco_autocomplete'=> 'bbcode'
+ '$bbcode' => (($mimetype == 'text/bbcode') ? true : false)
));
$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(