Putting 4.2.0 on top of 4.0.17

[usit-rt.git] / share / html / Elements / MessageBox

diff --git a/share/html/Elements/MessageBox b/share/html/Elements/MessageBox
index 6f55b270475c84be27cc8bcf094baf1d5425559a..53af2ca4c4af141b017360ba84e6936e061e70aa 100644 (file)
--- a/share/html/Elements/MessageBox
+++ b/share/html/Elements/MessageBox
@@ -62,13 +62,13 @@ if ( $QuoteTransaction ) {
 
 my $signature = '';
 if ( $IncludeSignature and my $text = $session{'CurrentUser'}->UserObj->Signature ) {
-       $signature = "-- \n". $text;
+    $signature = "-- \n". $text;
 }
 
 # wrap="something" seems to really break IE + richtext
 my $wrap_type = '';
 if ( not RT->Config->Get('MessageBoxRichText',  $session{'CurrentUser'}) ) {
-    $wrap_type = 'wrap="' . $m->interp->apply_escapes($Wrap, 'h') . '"';
+    $wrap_type = 'wrap="soft"';
 }
 
 # If there's no cols specified, we want to set the width to 100% in CSS
@@ -87,7 +87,6 @@ $Name             => 'Content'
 $Default          => ''
 $Width            => RT->Config->Get('MessageBoxWidth', $session{'CurrentUser'} )
 $Height           => RT->Config->Get('MessageBoxHeight', $session{'CurrentUser'} ) || 15
-$Wrap             => RT->Config->Get('MessageBoxWrap', $session{'CurrentUser'} ) || 'SOFT'
 $IncludeSignature => RT->Config->Get('MessageBoxIncludeSignature');
 $IncludeArticle   => 1;
 </%ARGS>