aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-09-02 13:39:13 -0700
committerfriendica <info@friendica.com>2013-09-02 13:39:13 -0700
commit5f2a7573d5423e82b3a73ca91a4e72a56dab1a14 (patch)
tree1aaff587af2517d62f495f7c8af9ebe6b0780435
parentf44274bfca6137795ee878a076d5aeed0b330f64 (diff)
downloadvolse-hubzilla-5f2a7573d5423e82b3a73ca91a4e72a56dab1a14.tar.gz
volse-hubzilla-5f2a7573d5423e82b3a73ca91a4e72a56dab1a14.tar.bz2
volse-hubzilla-5f2a7573d5423e82b3a73ca91a4e72a56dab1a14.zip
only allow richtext editor on pages if bbcode is the default mimetype, otherwise use plaintext editor. This will eventually need work to support a visual editor for html or other types.
-rw-r--r--include/conversation.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 31bfdbef9..c40691bba 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1013,17 +1013,17 @@ function status_editor($a,$x,$popup=false) {
if(feature_enabled(local_user(),'richtext'))
$plaintext = false;
- if(intval($x['plaintext']))
- $plaintext = true;
-
$mimeselct = '';
if(array_key_exists('mimetype',$x) && $x['mimetype']) {
- if($x['mimetype'] === 'choose')
+ 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'] . '" />';
+ $mimeselect = '<input name="mimetype" value="' . $x['mimetype'] . '" />';
}
-
+
$tpl = get_markup_template('jot-header.tpl');