Merge branch 'master' into dev

2016-04-18 16:45:58 +02:00
parent ca59ecd107 a49fa5f87c
commit 094d4cc325
1 changed files with 1 additions and 0 deletions
--- 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(