aboutsummaryrefslogtreecommitdiffstats
path: root/include/conversation.php
diff options
context:
space:
mode:
Diffstat (limited to 'include/conversation.php')
-rw-r--r--include/conversation.php16
1 files changed, 11 insertions, 5 deletions
diff --git a/include/conversation.php b/include/conversation.php
index a357e1480..c40691bba 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1013,11 +1013,17 @@ function status_editor($a,$x,$popup=false) {
if(feature_enabled(local_user(),'richtext'))
$plaintext = false;
- if(intval($x['plaintext']))
- $plaintext = true;
-
- if(intval($x['mimeselect']))
- $mimeselect = mimetype_select($x['profile_uid']);
+ $mimeselct = '';
+ if(array_key_exists('mimetype',$x) && $x['mimetype']) {
+ if($x['mimetype'] != 'text/bbcode')
+ $plaintext = true;
+ if($x['mimetype'] === 'choose') {
+ $mimeselect = mimetype_select($x['profile_uid']);
+ }
+ else
+ $mimeselect = '<input name="mimetype" value="' . $x['mimetype'] . '" />';
+ }
+
$tpl = get_markup_template('jot-header.tpl');