Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

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(

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);