aboutsummaryrefslogtreecommitdiffstats
path: root/include/message.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-05-07 14:43:38 -0700
committerzotlabs <mike@macgirvin.com>2017-05-07 14:43:38 -0700
commit8c38841a4dbc1a8daca2cfce12a295f467ecbb68 (patch)
tree6d8404008829fa4287090b5f229f0150514b6005 /include/message.php
parent2c2ee706ac84926ceca21f5a4522034eb1b67d54 (diff)
parentbd3708870d04bd59d3a632945d1f4ff63640afe8 (diff)
downloadvolse-hubzilla-8c38841a4dbc1a8daca2cfce12a295f467ecbb68.tar.gz
volse-hubzilla-8c38841a4dbc1a8daca2cfce12a295f467ecbb68.tar.bz2
volse-hubzilla-8c38841a4dbc1a8daca2cfce12a295f467ecbb68.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'include/message.php')
-rw-r--r--include/message.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/message.php b/include/message.php
index 61c3e8afd..a394a411d 100644
--- a/include/message.php
+++ b/include/message.php
@@ -210,8 +210,8 @@ function send_message($uid = 0, $recipient = '', $body = '', $subject = '', $rep
intval($channel['channel_id']),
dbesc($channel['channel_hash']),
dbesc($recipient),
- dbesc($subject),
dbesc(($mimetype)? $mimetype : 'text/bbcode'),
+ dbesc($subject),
dbesc($body),
dbesc($sig),
dbesc($jattach),