From 7afb41fdf9ef7158dd63d3be351b26d42d0c5b90 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Mon, 17 May 2010 16:13:01 -0700
Subject: [PATCH] Allow whitespace formatting in user invitations.  Preserve
 text messages with newlines.  Fixes bug #11538

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

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 204542fab..e33313340 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -19,6 +19,7 @@
  - fixed #11552: Visitors (and others) can bypass group-by-IP restrictions
  - fixed #11572: visitors can enter editProfile
  - fixed #11563: Syndicated Content - descriptionFirstParagraph cuts off
+ - fixed #11538: User invite mail: whitespace in message lost
 
 7.9.4
  - We're shipping underscore.js now for its suite of extremely handy utility
diff --git a/lib/WebGUI/Account/Inbox.pm b/lib/WebGUI/Account/Inbox.pm
index 609f78416..7c02f1df7 100644
--- a/lib/WebGUI/Account/Inbox.pm
+++ b/lib/WebGUI/Account/Inbox.pm
@@ -960,7 +960,7 @@ sub www_inviteUserSave {
         );
 
         ## No sneaky attack paths...
-        $var->{'message'} = WebGUI::HTML::html2text( WebGUI::HTML::filter($message) );
+        $var->{'message'} = WebGUI::HTML::format(WebGUI::HTML::filter($message));
 
         my $emailBody = $self->processTemplate( $var, $self->getInviteUserMessageTemplateId );