Merge remote-tracking branch 'upstream/master'

8 files changed, 27 insertions, 26 deletions

diff --git a/mod/editblock.php b/mod/editblock.php
index 507050eb0..536ddd7d2 100644
--- a/mod/editblock.php
+++ b/mod/editblock.php
@@ -58,8 +58,8 @@ function editblock_content(&$a) {
 	$plaintext = true;
 
 	// You may or may not be a local user.
-	if(local_user() && feature_enabled(local_user(),'richtext'))
-		$plaintext = false;
+//	if(local_user() && feature_enabled(local_user(),'richtext'))
+//		$plaintext = false;
 
 	$mimeselect = '';
 	$mimetype = $itm[0]['mimetype'];
diff --git a/mod/editlayout.php b/mod/editlayout.php
index da681cf34..1e8a6e990 100644
--- a/mod/editlayout.php
+++ b/mod/editlayout.php
@@ -65,8 +65,8 @@ function editlayout_content(&$a) {
 
 	$plaintext = true;
 // You may or may not be a local user.  This won't work,
-	if(feature_enabled(local_user(),'richtext'))
-		$plaintext = false;
+//	if(feature_enabled(local_user(),'richtext'))
+//		$plaintext = false;
 
 	$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
 		'$title' => t('Edit Layout')
diff --git a/mod/editwebpage.php b/mod/editwebpage.php
index b8b7a465c..9fe76ba98 100644
--- a/mod/editwebpage.php
+++ b/mod/editwebpage.php
@@ -73,8 +73,8 @@ function editwebpage_content(&$a) {
 
 	$plaintext = true;
 
-	if(feature_enabled($itm[0]['uid'],'richtext'))
-		$plaintext = false;
+//	if(feature_enabled($itm[0]['uid'],'richtext'))
+//		$plaintext = false;
 
 	$mimetype = $itm[0]['mimetype'];
 
diff --git a/mod/events.php b/mod/events.php
index 911b6c891..7c4d6c191 100755
--- a/mod/events.php
+++ b/mod/events.php
@@ -161,8 +161,8 @@ function events_content(&$a) {
 
 	$plaintext = true;
 
-	if(feature_enabled(local_user(),'richtext'))
-		$plaintext = false;
+//	if(feature_enabled(local_user(),'richtext'))
+//		$plaintext = false;
 
 
 
diff --git a/mod/item.php b/mod/item.php
index 693c64eca..c9ec56eeb 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -430,10 +430,14 @@ function item_post(&$a) {
 		// First figure out if it's a status post that would've been
 		// created using tinymce. Otherwise leave it alone. 
 
-		$plaintext = ((feature_enabled($profile_uid,'richtext')) ? false : true);
-		if((! $parent) && (! $api_source) && (! $plaintext)) {
-			$body = fix_mce_lf($body);
-		}
+		$plaintext = true;
+
+//		$plaintext = ((feature_enabled($profile_uid,'richtext')) ? false : true);
+//		if((! $parent) && (! $api_source) && (! $plaintext)) {
+//			$body = fix_mce_lf($body);
+//		}
+
+
 
 		// If we're sending a private top-level message with a single @-taggable channel as a recipient, @-tag it, if our pconfig is set.
 
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);
 
diff --git a/mod/profiles.php b/mod/profiles.php
index 2e91db600..f6392d4ab 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -477,8 +477,8 @@ function profiles_content(&$a) {
 
 
 		$editselect = 'none';
-		if(feature_enabled(local_user(),'richtext'))
-			$editselect = 'textareas';
+//		if(feature_enabled(local_user(),'richtext'))
+//			$editselect = 'textareas';
 
 		$a->page['htmlhead'] .= replace_macros(get_markup_template('profed_head.tpl'), array(
 			'$baseurl'    => $a->get_baseurl(true),
diff --git a/mod/rpost.php b/mod/rpost.php
index 309208870..80406ebef 100644
--- a/mod/rpost.php
+++ b/mod/rpost.php
@@ -83,8 +83,8 @@ function rpost_content(&$a) {
 	}
 
 	$plaintext = true;
-	if(feature_enabled(local_user(),'richtext'))
-		$plaintext = false;
+//	if(feature_enabled(local_user(),'richtext'))
+//		$plaintext = false;
 
 	if(array_key_exists('type', $_REQUEST) && $_REQUEST['type'] === 'html') {
 		require_once('include/html2bbcode.php');