From 187b6441c1ec7a893c3aea4811c355257069781a Mon Sep 17 00:00:00 2001
From: Zach Prezkuta <fermion@gmx.com>
Date: Sat, 26 Jan 2013 12:53:35 -0700
Subject: [PATCH] make the richtext feature work for events, wall messages, and
 contact notes

---
 mod/contacts.php    |  6 +++---
 mod/events.php      | 14 ++++++++++++--
 mod/wallmessage.php |  8 ++++++--
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/mod/contacts.php b/mod/contacts.php
index 6e62ec8e..ffd43434 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -244,9 +244,9 @@ function contacts_content(&$a) {
 		$contact_id = $a->data['contact']['id'];
 		$contact = $a->data['contact'];
 
-		$editselect = 'exact';
-		if(intval(get_pconfig(local_user(),'system','plaintext')))
-			$editselect = 'none';
+		$editselect = 'none';
+		if( feature_enabled(local_user(),'richtext') )
+			$editselect = 'exact';
 
 		$a->page['htmlhead'] .= replace_macros(get_markup_template('contact_head.tpl'), array(
 			'$baseurl' => $a->get_baseurl(true),
diff --git a/mod/events.php b/mod/events.php
index 2f41c0e3..be8b8431 100755
--- a/mod/events.php
+++ b/mod/events.php
@@ -156,11 +156,21 @@ function events_content(&$a) {
 	}
 
 
+	$editselect = 'none';
+	if( feature_enabled(local_user(), 'richtext') )
+		$editselect = 'textareas';
+
 	$htpl = get_markup_template('event_head.tpl');
-	$a->page['htmlhead'] .= replace_macros($htpl,array('$baseurl' => $a->get_baseurl()));
+	$a->page['htmlhead'] .= replace_macros($htpl,array(
+		'$baseurl' => $a->get_baseurl(),
+		'$editselect' => $editselect
+	));
 
 	$etpl = get_markup_template('event_end.tpl');
-	$a->page['end'] .= replace_macros($etpl,array('$baseurl' => $a->get_baseurl()));
+	$a->page['end'] .= replace_macros($etpl,array(
+		'$baseurl' => $a->get_baseurl(),
+		'$editselect' => $editselect
+	));
 
 	$o ="";
 	// tabs
diff --git a/mod/wallmessage.php b/mod/wallmessage.php
index 24d21883..b8859bad 100644
--- a/mod/wallmessage.php
+++ b/mod/wallmessage.php
@@ -115,10 +115,14 @@ function wallmessage_content(&$a) {
 
 
 
+	$editselect = 'none';
+	if( feature_enabled(local_user(), 'richtext') )
+		$editselect = '/(profile-jot-text|prvmail-text)/';
+
 	$tpl = get_markup_template('wallmsg-header.tpl');
 	$a->page['htmlhead'] .= replace_macros($tpl, array(
 		'$baseurl' => $a->get_baseurl(true),
-		'$editselect' => '/(profile-jot-text|prvmail-text)/',
+		'$editselect' => $editselect,
 		'$nickname' => $user['nickname'],
 		'$linkurl' => t('Please enter a link URL:')
 	));
@@ -126,7 +130,7 @@ function wallmessage_content(&$a) {
 	$tpl = get_markup_template('wallmsg-end.tpl');
 	$a->page['end'] .= replace_macros($tpl, array(
 		'$baseurl' => $a->get_baseurl(true),
-		'$editselect' => '/(profile-jot-text|prvmail-text)/',
+		'$editselect' => $editselect,
 		'$nickname' => $user['nickname'],
 		'$linkurl' => t('Please enter a link URL:')
 	));