diff options
| author | friendica <info@friendica.com> | 2013-09-02 01:38:17 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-09-02 01:38:17 -0700 |
| commit | 8b7757e033c4483da24700722c186057bb431164 (patch) | |
| tree | c331db3262084b08b47970c20f2d8657d6ebef81 /include/conversation.php | |
| parent | a35d440ff1fee806a8aa17a0297e1163db6a3ba5 (diff) | |
| download | volse-hubzilla-8b7757e033c4483da24700722c186057bb431164.tar.gz volse-hubzilla-8b7757e033c4483da24700722c186057bb431164.tar.bz2 volse-hubzilla-8b7757e033c4483da24700722c186057bb431164.zip | |
webpage content-type -- needs cleaning up and a security check once all the important bits are in place.
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/conversation.php b/include/conversation.php index 2157f8291..a357e1480 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1009,9 +1009,16 @@ function status_editor($a,$x,$popup=false) { $geotag = (($x['allow_location']) ? replace_macros(get_markup_template('jot_geotag.tpl'), array()) : ''); $plaintext = true; + if(feature_enabled(local_user(),'richtext')) $plaintext = false; + if(intval($x['plaintext'])) + $plaintext = true; + + if(intval($x['mimeselect'])) + $mimeselect = mimetype_select($x['profile_uid']); + $tpl = get_markup_template('jot-header.tpl'); $a->page['htmlhead'] .= replace_macros($tpl, array( @@ -1079,6 +1086,7 @@ function status_editor($a,$x,$popup=false) { '$emtitle' => t('Example: bob@example.com, mary@example.com'), '$lockstate' => $x['lockstate'], '$acl' => $x['acl'], + '$mimeselect' => $mimeselect, '$showacl' => ((array_key_exists('showacl',$x)) ? $x['showacl'] : 'yes'), '$bang' => $x['bang'], '$profile_uid' => $x['profile_uid'], |