diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-04-26 14:20:16 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-04-26 14:20:16 +0200 |
| commit | d1c84ad9f0884bb49c7840ac59f5756b16cb7aef (patch) | |
| tree | 159d3ea820598e16712519ffc6274615b778108b /include | |
| parent | c904bd3a628e4bf3c2420ee314277da69828c3b2 (diff) | |
| parent | c39a6800968f7ac017d215306b55d5b6bb39ded6 (diff) | |
| download | volse-hubzilla-d1c84ad9f0884bb49c7840ac59f5756b16cb7aef.tar.gz volse-hubzilla-d1c84ad9f0884bb49c7840ac59f5756b16cb7aef.tar.bz2 volse-hubzilla-d1c84ad9f0884bb49c7840ac59f5756b16cb7aef.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/conversation.php | 9 | ||||
| -rw-r--r-- | include/message.php | 6 |
2 files changed, 13 insertions, 2 deletions
diff --git a/include/conversation.php b/include/conversation.php index 5b2d60583..0f940b1a3 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1541,6 +1541,15 @@ function prepare_page($item) { // the template will get passed an unobscured title. $body = prepare_body($item, true); + if(App::$page['template'] == 'none') { + $tpl = 'page_display_empty.tpl'; + + return replace_macros(get_markup_template($tpl), array( + '$body' => $body['html'] + )); + + } + $tpl = get_pconfig($item['uid'], 'system', 'pagetemplate'); if (! $tpl) $tpl = 'page_display.tpl'; diff --git a/include/message.php b/include/message.php index da3514184..e7db98d7e 100644 --- a/include/message.php +++ b/include/message.php @@ -188,9 +188,10 @@ function send_message($uid = 0, $recipient = '', $body = '', $subject = '', $rep $body = str_rot47(base64url_encode($body)); $sig = ''; // placeholder + $mimetype = ''; //placeholder - $r = q("INSERT INTO mail ( account_id, conv_guid, mail_obscured, channel_id, from_xchan, to_xchan, title, body, sig, attach, mid, parent_mid, created, expires, mail_isreply ) - VALUES ( %d, '%s', %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d )", + $r = q("INSERT INTO mail ( account_id, conv_guid, mail_obscured, channel_id, from_xchan, to_xchan, mail_mimetype, title, body, sig, attach, mid, parent_mid, created, expires, mail_isreply ) + VALUES ( %d, '%s', %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d )", intval($channel['channel_account_id']), dbesc($conv_guid), intval(1), @@ -198,6 +199,7 @@ function send_message($uid = 0, $recipient = '', $body = '', $subject = '', $rep dbesc($channel['channel_hash']), dbesc($recipient), dbesc($subject), + dbesc(($mimetype)? $mimetype : 'text/bbcode'), dbesc($body), dbesc($sig), dbesc($jattach), |