harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
redmatrix 2016-04-18 19:17:20 -07:00
commit 2a61817bad
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mod/editpost.php
View File

@ -160,6 +160,7 @@ function editpost_content(&$a) {
'$cipher' => $cipher, '$cipher' => $cipher,
'$expiryModalOK' => t('OK'), '$expiryModalOK' => t('OK'),
'$expiryModalCANCEL' => t('Cancel'), '$expiryModalCANCEL' => t('Cancel'),
'$bbcode' => true
)); ));
$o .= replace_macros(get_markup_template('edpost_head.tpl'), array( $o .= replace_macros(get_markup_template('edpost_head.tpl'), array(

4
mod/rpost.php
View File

@ -119,7 +119,9 @@ function rpost_content(&$a) {
'body' => $_REQUEST['body'], 'body' => $_REQUEST['body'],
'attachment' => $_REQUEST['attachment'], 'attachment' => $_REQUEST['attachment'],
'source' => ((x($_REQUEST,'source')) ? strip_tags($_REQUEST['source']) : ''), '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); $editor = status_editor($a,$x);