diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 7ce70ffaf..ad391953e 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -10,8 +10,8 @@ - fixed: Adding a file extension for URLs in the system settings now properly affects newly created Assets. It still does not update existing asset URL's. - fixed #9152: Pagination broken in Contribs Section of new Account System - fixed #4159: more menu doesn't appear for current asset on crumb trail - - fixed: Adding a file extension for URLs in the system settings now properly affects newly created Assets. It still does not update existing asset URL's. - fixed #9157: another typ-o in i18n + - fixed #9112: Thingy View Thing screen doesn't preserve newlines 7.6.4 - Survey now will show progress and time limit. @@ -79,6 +79,7 @@ - fixed #9140: Date format error when adding tasks to PM - fixed #8800: Errors in POD of Asset-related mix-in modules (Bernd Kalbfuß-Zimmermann) - fixed #9143: Yes No user profile fields problem when default == 1 + - fixed #9155: purpose of "headblock" duplicates "extra head tags" 7.5.34 - fixed: Regression with ProfileField->formField. Added tests to prevent future regression diff --git a/lib/WebGUI/Form/Textarea.pm b/lib/WebGUI/Form/Textarea.pm index 5a9769aa4..5d250c632 100644 --- a/lib/WebGUI/Form/Textarea.pm +++ b/lib/WebGUI/Form/Textarea.pm @@ -194,6 +194,7 @@ sub getValueAsHtml { my $self = shift; my $value = $self->SUPER::getValueAsHtml(@_); $value = WebGUI::HTML::filter($value, 'text'); + $value =~ s/\n/
/sg; return $value; } diff --git a/t/Form/Textarea.t b/t/Form/Textarea.t index 5b68f066d..6d6399228 100644 --- a/t/Form/Textarea.t +++ b/t/Form/Textarea.t @@ -44,7 +44,7 @@ my $testBlock = [ my $formType = 'textarea'; -my $numTests = 7 + scalar @{ $testBlock } + 5; +my $numTests = 7 + scalar @{ $testBlock } + 6; plan tests => $numTests; @@ -104,6 +104,15 @@ is($txt->getValue("some \ntest \r\nhere"), "some \ntest \r\nhere", 'getValue(new is($session->form->textarea(undef,"some test here"), "some test here", 'session->form->textarea(undef,text)'); is($session->form->textarea(undef,"some \ntest \r\nhere"), "some \ntest \r\nhere", 'session->form->textarea(undef,newlines)'); +################################################################### +# +# getValueAsHtml +# +################################################################### + +$txt = WebGUI::Form::Textarea->new($session, { value => "line1\nline2\nline3", }); +is($txt->getValueAsHtml, 'line1
line2
line3', 'getValueAsHtml translates newlines into break tags'); + __END__