diff options
| author | ivan <ivan> | 2009-07-20 04:40:41 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2009-07-20 04:40:41 +0000 |
| commit | 3aa3b1bab64f02a54d0b82e8e7268da56a88e019 (patch) | |
| tree | f3523d31409109aa802ee4059e1e74af815f159b | |
| parent | b57b4b058ee83adb39f66d26d27f249f027f23cf (diff) | |
slightly improve terrible quoting behavior when you change MessageBoxWidth
| -rw-r--r-- | rt/FREESIDE_MODIFIED | 1 | ||||
| -rw-r--r-- | rt/lib/RT/Transaction_Overlay.pm | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/rt/FREESIDE_MODIFIED b/rt/FREESIDE_MODIFIED index d5f35e38a..dc5e2bc2a 100644 --- a/rt/FREESIDE_MODIFIED +++ b/rt/FREESIDE_MODIFIED @@ -4,6 +4,7 @@ config.layout.in etc/RT_SiteConfig.pm lib/RT/Interface/Web_Vendor.pm lib/RT/SearchBuilder.pm #need DBIx::SearchBuilder >= 1.36 for Pg 8.1+ +lib/RT/Transaction_Overlay.pm lib/RT/URI/freeside.pm lib/RT/URI/freeside/Internal.pm lib/RT/URI/freeside/XMLRPC.pm diff --git a/rt/lib/RT/Transaction_Overlay.pm b/rt/lib/RT/Transaction_Overlay.pm index 451f9d732..dd1887e33 100644 --- a/rt/lib/RT/Transaction_Overlay.pm +++ b/rt/lib/RT/Transaction_Overlay.pm @@ -276,7 +276,7 @@ textual part (as defined in RT::I18N::IsTextualContentType). Otherwise, returns undef. Takes a paramhash. If the $args{'Quote'} parameter is set, wraps this message -at $args{'Wrap'}. $args{'Wrap'} defaults to 70. +at $args{'Wrap'}. $args{'Wrap'} defaults to $RT::MessageBoxWidth - 2 or 70. If $args{'Type'} is set to C<text/html>, plain texts are upgraded to HTML. Otherwise, HTML texts are downgraded to plain text. If $args{'Type'} is @@ -290,6 +290,7 @@ sub Content { Type => $PreferredContentType, Quote => 0, Wrap => 70, + Wrap => ( $RT::MessageBoxWidth || 72 ) - 2, @_ ); @@ -335,7 +336,7 @@ sub Content { $max = length if ( length > $max ); } - if ( $max > 76 ) { + if ( $max > $args{'Wrap'}+6 ) { # 76 ) { require Text::Wrapper; my $wrapper = new Text::Wrapper( columns => $args{'Wrap'}, |