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/item.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/item.php')
| -rw-r--r-- | mod/item.php | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/mod/item.php b/mod/item.php index 693c64eca..c9ec56eeb 100644 --- a/mod/item.php +++ b/mod/item.php @@ -430,10 +430,14 @@ function item_post(&$a) { // First figure out if it's a status post that would've been // created using tinymce. Otherwise leave it alone. - $plaintext = ((feature_enabled($profile_uid,'richtext')) ? false : true); - if((! $parent) && (! $api_source) && (! $plaintext)) { - $body = fix_mce_lf($body); - } + $plaintext = true; + +// $plaintext = ((feature_enabled($profile_uid,'richtext')) ? false : true); +// if((! $parent) && (! $api_source) && (! $plaintext)) { +// $body = fix_mce_lf($body); +// } + + // If we're sending a private top-level message with a single @-taggable channel as a recipient, @-tag it, if our pconfig is set. |