From 5976238b4404a8ccda95089077e3ab3e9e36f023 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Tue, 22 Nov 2005 20:28:44 +0000
Subject: [PATCH] merging 6.7.8 changes

---
 lib/WebGUI/Form/HTMLArea.pm              |  7 +++++++
 lib/WebGUI/i18n/English/Form_HTMLArea.pm | 12 ++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 lib/WebGUI/i18n/English/Form_HTMLArea.pm

diff --git a/lib/WebGUI/Form/HTMLArea.pm b/lib/WebGUI/Form/HTMLArea.pm
index 7394a1985..efb573a58 100644
--- a/lib/WebGUI/Form/HTMLArea.pm
+++ b/lib/WebGUI/Form/HTMLArea.pm
@@ -129,6 +129,13 @@ sub toHtml {
         WebGUI::Style::setScript($session{config}{extrasURL}.'/textFix.js',{ type=>'text/javascript' });
 	$self->{extras} .= ' onblur="fixChars(this.form.'.$self->{name}.')" mce_editable="true" ';	
 	return $self->SUPER::toHtml.WebGUI::Asset::RichEdit->new($self->{richEditId})->getRichEditor($self->{id});
+	my $richEdit = WebGUI::Asset::RichEdit->new($self->{richEditId});
+        if ($defined) {
+                return $self->SUPER::toHtml.$richEdit->getRichEditor($self->{id});
+        } else {
+		return WebGUI::International::get('rich editor load error','Form_HTMLArea');
+	}
+
 }
 
 
diff --git a/lib/WebGUI/i18n/English/Form_HTMLArea.pm b/lib/WebGUI/i18n/English/Form_HTMLArea.pm
new file mode 100644
index 000000000..d55860757
--- /dev/null
+++ b/lib/WebGUI/i18n/English/Form_HTMLArea.pm
@@ -0,0 +1,12 @@
+package WebGUI::i18n::English::Form_HTMLArea;  ##Be sure to change the package name to match the filename
+
+our $I18N = { ##hashref of hashes
+	'rich editor load error' => { 
+		message => q|Can't instanciate rich editor.|,
+		lastUpdated => 0,
+		context => q|Error message letting the user know that loading the rich editor has failed for some reason.|
+	},
+
+};
+
+1;