From b263d76b15a4b13fca20d42e5e0acce210857c33 Mon Sep 17 00:00:00 2001
From: Matthew Wilson <matt@plainblack.com>
Date: Mon, 13 Jun 2005 19:44:20 +0000
Subject: [PATCH]  - fix [ 1216061 ] 2 rich editors - 1 field

---
 docs/changelog/6.x.x.txt     | 9 +++++----
 lib/WebGUI/Asset/RichEdit.pm | 5 +++--
 lib/WebGUI/Form.pm           | 2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 54af683d1..73053f21f 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -15,7 +15,7 @@
  - fix [ 1214399 ] Admin Bar Unusable
  - fix [ 1196086 ] certain DOCTYPEs break the admin slidebar
  - fix [ 1189186 ] 6.6 CVS Admin menu is invisible on failsafe templater
- - fix [ 1215228 ] getToolbar uses get("url") instead of getUrl
+ - fix [ 1215228 ] getToolbar uses get("url") instead of getUrl [mwilson]
  - fix [ 1187040 ] getNextChildRank doesn't handle rank 999999
  - fix [ 1179021 ] cannot set default value of 0 in several form elements
  - fix [ 1172993 ] Product asset issues
@@ -28,9 +28,10 @@
  - fix [ 1216062 ] http proxy not proxing images
  - fix [ 1216066 ] url caching broken
  - fix [ 1218475 ] cannot set "who to view" in style templates
- - fix [ 1219745 ] setSize doesn't work with Images
- - fix [ 1206045 ] Max Image Size don't work
- - fix [ 1219805 ] storage.pm renameFile refers to getNode
+ - fix [ 1219745 ] setSize doesn't work with Images [mwilson]
+ - fix [ 1206045 ] Max Image Size don't work [mwilson]
+ - fix [ 1219805 ] storage.pm renameFile refers to getNode [mwilson]
+ - fix [ 1216061 ] 2 rich editors - 1 field [mwilson]
 
 
 6.6.1
diff --git a/lib/WebGUI/Asset/RichEdit.pm b/lib/WebGUI/Asset/RichEdit.pm
index 68c5dd2ea..d2f4fba2b 100644
--- a/lib/WebGUI/Asset/RichEdit.pm
+++ b/lib/WebGUI/Asset/RichEdit.pm
@@ -401,7 +401,7 @@ sub getName {
 #-------------------------------------------------------------------
 sub getRichEditor {
 	my $self = shift;
-	my $calledAsWebMethod = shift;
+	my $nameId = shift;
 	my @toolbarRow1 = split("\n",$self->getValue("toolbarRow1"));	
 	push(@toolbarRow1,"contextmenu") if ($self->getValue("enableContextMenu"));
 	my @toolbarRow2 = split("\n",$self->getValue("toolbarRow2"));	
@@ -409,7 +409,8 @@ sub getRichEditor {
 	my @toolbarButtons = (@toolbarRow1,@toolbarRow2,@toolbarRow3);
 	my @plugins;
 	my %config = (
-		mode => "specific_textareas",
+		mode => "exact",
+		elements => $nameId,
 		theme => "advanced",
 		document_base_url => "/",
 		auto_reset_designmode => "true",
diff --git a/lib/WebGUI/Form.pm b/lib/WebGUI/Form.pm
index 797382559..7abe6b3b6 100644
--- a/lib/WebGUI/Form.pm
+++ b/lib/WebGUI/Form.pm
@@ -1189,7 +1189,7 @@ sub HTMLArea {
 		defaultValue=>$params->{defaultValue}
                 });
 	WebGUI::Style::setScript($session{config}{extrasURL}.'/textFix.js',{ type=>'text/javascript' });
-	$output .= WebGUI::Asset::RichEdit->new($richEditId)->getRichEditor;
+	$output .= WebGUI::Asset::RichEdit->new($richEditId)->getRichEditor($params->{name});
 	return $output;
 }