diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-12-03 18:14:52 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-12-03 18:14:52 +0100 |
| commit | c363fc71eb054ffa615bdfe03c645a9ab946379e (patch) | |
| tree | 564dbaa2dac8bb13260704730a8e5483084baa67 /mod | |
| parent | b96f09bb3aeee403038755ab5f6e6b53654cb145 (diff) | |
| parent | 9f3ea71d5d9e1e42d1d1e44a8070d90814962ad2 (diff) | |
| download | volse-hubzilla-c363fc71eb054ffa615bdfe03c645a9ab946379e.tar.gz volse-hubzilla-c363fc71eb054ffa615bdfe03c645a9ab946379e.tar.bz2 volse-hubzilla-c363fc71eb054ffa615bdfe03c645a9ab946379e.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/dirsearch.php | 4 | ||||
| -rw-r--r-- | mod/mail.php | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mod/dirsearch.php b/mod/dirsearch.php index 548acbd08..388e5f3ac 100644 --- a/mod/dirsearch.php +++ b/mod/dirsearch.php @@ -26,8 +26,8 @@ function dirsearch_content(&$a) { $token = get_config('system','realm_token'); if($token && $access_token != $token) { - $result['message'] = t('This directory server requires an access token'); - return; + $ret['message'] = t('This directory server requires an access token'); + json_return_and_die($ret); } diff --git a/mod/mail.php b/mod/mail.php index 536149a28..44c4b479d 100644 --- a/mod/mail.php +++ b/mod/mail.php @@ -329,7 +329,8 @@ function mail_content(&$a) { 'to_url' => chanlink_hash($message['to_xchan']), 'to_photo' => $message['to']['xchan_photo_s'], 'subject' => $message['title'], - 'body' => smilies(bbcode($message['body']) . $s), + 'body' => smilies(bbcode($message['body'])), + 'attachments' => $s, 'delete' => t('Delete message'), 'dreport' => t('Delivery report'), 'recall' => t('Recall message'), |