projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
import rt 3.4.6
[freeside.git]
/
rt
/
lib
/
RT
/
Attachment_Overlay.pm
diff --git
a/rt/lib/RT/Attachment_Overlay.pm
b/rt/lib/RT/Attachment_Overlay.pm
index
fe189e3
..
d1f0ed4
100644
(file)
--- a/
rt/lib/RT/Attachment_Overlay.pm
+++ b/
rt/lib/RT/Attachment_Overlay.pm
@@
-296,7
+296,7
@@
sub OriginalContent {
eval {return( Encode::decode_utf8($content))} || return ($content);
}
eval {return( Encode::decode_utf8($content))} || return ($content);
}
- eval { Encode::from_to($content, 'utf8' => $enc)
;}
;
+ eval { Encode::from_to($content, 'utf8' => $enc)
} if $enc
;
if ($@) {
$RT::Logger->error("Could not convert attachment from assumed utf8 to '$enc' :".$@);
}
if ($@) {
$RT::Logger->error("Could not convert attachment from assumed utf8 to '$enc' :".$@);
}