Merge remote-tracking branch 'upstream/master'

2016-04-18 18:07:20 +02:00
parent fddacf0a5a a49fa5f87c
commit e47a473e2c
7 changed files with 11987 additions and 11956 deletions
@@ -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(
@@ -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);
@@ -1 +1 @@
-2016-04-16.1368H
+2016-04-18.1370H