diff options
| author | root <root@v22013111044215586.yourvserver.net> | 2014-06-29 18:30:59 +0200 |
|---|---|---|
| committer | root <root@v22013111044215586.yourvserver.net> | 2014-06-29 18:30:59 +0200 |
| commit | 5df50c4a0bf80f3697c7088c9c4a3815206fe97d (patch) | |
| tree | ad3f2b4df700dae971683265c9a83d5bbee0eb31 /mod/mail.php | |
| parent | 79dc4b83701f73bdece2b4d78a73698fbbc538c6 (diff) | |
| parent | 628f1218049715c8acf953dbda8f902b3902cc2f (diff) | |
| download | volse-hubzilla-5df50c4a0bf80f3697c7088c9c4a3815206fe97d.tar.gz volse-hubzilla-5df50c4a0bf80f3697c7088c9c4a3815206fe97d.tar.bz2 volse-hubzilla-5df50c4a0bf80f3697c7088c9c4a3815206fe97d.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/mail.php')
| -rw-r--r-- | mod/mail.php | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/mod/mail.php b/mod/mail.php index 9c84872ef..c3ce47b5a 100644 --- a/mod/mail.php +++ b/mod/mail.php @@ -76,9 +76,9 @@ function mail_post(&$a) { } } - if(feature_enabled(local_user(),'richtext')) { - $body = fix_mce_lf($body); - } +// if(feature_enabled(local_user(),'richtext')) { +// $body = fix_mce_lf($body); +// } if(! $recipient) { notice('No recipient found.'); @@ -156,11 +156,7 @@ function mail_content(&$a) { $o .= $header; - $plaintext = false; - if(intval(get_pconfig(local_user(),'system','plaintext'))) - $plaintext = true; - if(! feature_enabled(local_user(),'richtext')) - $plaintext = true; + $plaintext = true; $tpl = get_markup_template('msg-header.tpl'); @@ -240,8 +236,9 @@ function mail_content(&$a) { $o .= $header; $plaintext = true; - if( local_user() && feature_enabled(local_user(),'richtext') ) - $plaintext = false; + +// if( local_user() && feature_enabled(local_user(),'richtext') ) +// $plaintext = false; $messages = private_messages_fetch_conversation(local_user(), argv(1), true); |