aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgit-marijus <mario@mariovavti.com>2017-05-07 15:07:26 +0200
committerGitHub <noreply@github.com>2017-05-07 15:07:26 +0200
commitb237425c9465dad8c0f597f3402d8119d40d1b2e (patch)
treeb3b43af694cb9f7fbfdfcabf1be4436cd9103dbe
parent00b19ccee0db5fd628c4959ac665234395a92989 (diff)
parent6576f9c0c3727d7c1543b168c7578a24b64e9184 (diff)
downloadvolse-hubzilla-b237425c9465dad8c0f597f3402d8119d40d1b2e.tar.gz
volse-hubzilla-b237425c9465dad8c0f597f3402d8119d40d1b2e.tar.bz2
volse-hubzilla-b237425c9465dad8c0f597f3402d8119d40d1b2e.zip
Merge pull request #760 from anaqreon/2.4RC
Mail message mimetype was getting set as the subject due to wrong var…
-rw-r--r--include/message.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/message.php b/include/message.php
index b56f98238..4e8e44adc 100644
--- a/include/message.php
+++ b/include/message.php
@@ -200,8 +200,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),