From 072ccd2cc6d64cf468aaf413a9b3087ff8891993 Mon Sep 17 00:00:00 2001
From: Graham Knop <graham@plainblack.com>
Date: Mon, 24 Nov 2008 04:03:04 +0000
Subject: [PATCH] fixed #9130: fixed: Rich editor creates root <p> tag even
 when set to use <br />

---
 docs/changelog/7.x.x.txt     | 1 +
 lib/WebGUI/Asset/RichEdit.pm | 1 +
 2 files changed, 2 insertions(+)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 7b7a126c7..d3a4c5f71 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -54,6 +54,7 @@
  - fixed #9138: Fat fonts break WebGUI captchas
  - fixed #8982: Deploy package doesn't take back to asset manager 
  - fixed #8956: Not checking for populated variable
+ - fixed #9130: fixed: Rich editor creates root <p> tag even when set to use <br />
 
 7.6.3
  - improved performance of file uploads
diff --git a/lib/WebGUI/Asset/RichEdit.pm b/lib/WebGUI/Asset/RichEdit.pm
index cef035321..3d0d263b4 100644
--- a/lib/WebGUI/Asset/RichEdit.pm
+++ b/lib/WebGUI/Asset/RichEdit.pm
@@ -481,6 +481,7 @@ sub getRichEditor {
 		preformatted => $self->getValue("preformatted") ? JSON::true() : JSON::false(),
 		force_br_newlines => $self->getValue("useBr") ? JSON::true() : JSON::false(),
 		force_p_newlines => $self->getValue("useBr") ? JSON::false() : JSON::true(),
+        $self->getValue("useBr") ? ( forced_root_block => JSON::false() ) : (),
 		remove_linebreaks => $self->getValue("removeLineBreaks") ? JSON::true() : JSON::false(),
 		nowrap => $self->getValue("nowrap") ? JSON::true() : JSON::false(),
 		directionality => $self->getValue("directionality"),