From 5f2a7573d5423e82b3a73ca91a4e72a56dab1a14 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 2 Sep 2013 13:39:13 -0700
Subject: 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.

---
 include/conversation.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'include/conversation.php')

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');
 	
-- 
cgit v1.2.3