From 82867ec273ef31d9d13489ae1bd9304922cce337 Mon Sep 17 00:00:00 2001
From: Drake <drake@plainblack.com>
Date: Wed, 6 Dec 2006 17:29:11 +0000
Subject: [PATCH] Fix Default Rich Editor setting so that it renders correctly.

---
 docs/changelog/7.x.x.txt         | 1 +
 lib/WebGUI/Operation/Settings.pm | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index b95b206f7..69008602c 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -45,6 +45,7 @@
    want it to run.
  - fix: new profile fields and new users not handling profile defaults right
  - fix: subscription dates
+ - fix: Default Rich Editor setting not rendering correctly
  - The Events Calendar is now the new Calendar with some fun new features.
    All your existing Events Calendars will be migrated automatically. 
  - Major change: password recovery is now based on profile fields rather than
diff --git a/lib/WebGUI/Operation/Settings.pm b/lib/WebGUI/Operation/Settings.pm
index 5d2205cfb..79fbf5fbc 100644
--- a/lib/WebGUI/Operation/Settings.pm
+++ b/lib/WebGUI/Operation/Settings.pm
@@ -176,9 +176,8 @@ sub definition {
 		name=>"richEditor",
 		label=>$i18n->get("default rich editor"),
 		hoverHelp=>$i18n->get("default rich editor description"),
-		defaultValue=>[$session->setting->get("richEditor")],
-		options=>WebGUI::Asset::RichEdit->getList($session),
-		defaultValue=>["PBrichedit000000000001"]
+		defaultValue=>[$session->setting->get("richEditor") || "PBrichedit000000000001"],
+		options=>WebGUI::Asset::RichEdit->getList($session)
 		});
 	push(@fields, {
 		tab=>"ui",