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 /include/conversation.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 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/conversation.php b/include/conversation.php index d8d60ee10..b6db54943 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1029,8 +1029,8 @@ function status_editor($a,$x,$popup=false) { $plaintext = true; - if(feature_enabled(local_user(),'richtext')) - $plaintext = false; +// if(feature_enabled(local_user(),'richtext')) +// $plaintext = false; $mimeselect = ''; if(array_key_exists('mimetype',$x) && $x['mimetype']) { |