diff options
Diffstat (limited to 'rt/lib')
| -rw-r--r-- | rt/lib/RT.pm | 10 | ||||
| -rw-r--r-- | rt/lib/RT/Transaction_Overlay.pm | 5 |
2 files changed, 9 insertions, 6 deletions
diff --git a/rt/lib/RT.pm b/rt/lib/RT.pm index 0d0c0f509..22fb9a11c 100644 --- a/rt/lib/RT.pm +++ b/rt/lib/RT.pm @@ -68,7 +68,7 @@ use vars qw($VERSION $System $SystemUser $Nobody $Handle $Logger $MasonSessionDir ); -$VERSION = '3.6.4'; +$VERSION = '3.6.6'; $CORE_CONFIG_FILE = "/opt/rt3/etc/RT_Config.pm"; $SITE_CONFIG_FILE = "/opt/rt3/etc/RT_SiteConfig.pm"; @@ -161,12 +161,12 @@ EOF } eval { require $CORE_CONFIG_FILE }; if ($@) { - my ($fileuid,$filegid) = (stat($SITE_CONFIG_FILE))[4,5]; + my ($fileuid,$filegid) = (stat($CORE_CONFIG_FILE))[4,5]; my $fileusername = getpwuid($fileuid); my $filegroup = getgrgid($filegid); - my $errormessage = sprintf($message, $SITE_CONFIG_FILE, + my $errormessage = sprintf($message, $CORE_CONFIG_FILE, $fileusername, $filegroup, $filegroup); - die ("$errormessage '$CORE_CONFIG_FILE'\n$@") + die ("$errormessage\n$@") } # RT::Essentials mistakenly recommends that WebPath be set to '/'. @@ -459,6 +459,8 @@ ok ($RT::SystemUser->Name() ne 'noname', "The system user isn't noname"); =cut +eval "require RT_Vendor"; +die $@ if ($@ && $@ !~ qr{^Can't locate RT_Vendor.pm}); eval "require RT_Local"; die $@ if ($@ && $@ !~ qr{^Can't locate RT_Local.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'}, |