rule of snakes #1, kill the snake.

tinymce is gone. if you want a visual editor, figure out what you want and make it happen.
If you don't want a visual editor, do nothing.
This is in the community's hands. I don't need a visual editor.

1 files changed, 7 insertions, 10 deletions

diff --git a/mod/mail.php b/mod/mail.php
index 9c84872ef..c3ce47b5a 100644
--- a/mod/mail.php
+++ b/mod/mail.php
@@ -76,9 +76,9 @@ function mail_post(&$a) {
 		}
 	}
 
-	if(feature_enabled(local_user(),'richtext')) {
-		$body = fix_mce_lf($body);
-	}
+//	if(feature_enabled(local_user(),'richtext')) {
+//		$body = fix_mce_lf($body);
+//	}
 
 	if(! $recipient) {
 		notice('No recipient found.');
@@ -156,11 +156,7 @@ function mail_content(&$a) {
 		
 		$o .= $header;
 		
-		$plaintext = false;
-		if(intval(get_pconfig(local_user(),'system','plaintext')))
-			$plaintext = true;
-		if(! feature_enabled(local_user(),'richtext'))
-			$plaintext = true;
+		$plaintext = true;
 
 		$tpl = get_markup_template('msg-header.tpl');
 
@@ -240,8 +236,9 @@ function mail_content(&$a) {
 		$o .= $header;
 
 		$plaintext = true;
-		if( local_user() && feature_enabled(local_user(),'richtext') )
-			$plaintext = false;
+
+//		if( local_user() && feature_enabled(local_user(),'richtext') )
+//			$plaintext = false;
 
 		$messages = private_messages_fetch_conversation(local_user(), argv(1), true);