|
|
@@ -1,17 +1,9 @@
|
|
|
---- lib/RT/User_Overlay.pm.dist 2003-08-05 16:22:34.000000000 +0200
|
|
|
-+++ lib/RT/User_Overlay.pm 2003-08-05 16:29:17.000000000 +0200
|
|
|
-@@ -203,7 +203,6 @@
|
|
|
- @_ # get the real argumentlist
|
|
|
- );
|
|
|
-
|
|
|
--
|
|
|
- $args{'EmailAddress'} = $self->CanonicalizeEmailAddress($args{'EmailAddress'});
|
|
|
-
|
|
|
- #Check the ACL
|
|
|
-@@ -274,7 +273,7 @@
|
|
|
-
|
|
|
+--- lib/RT/User_Overlay.pm.dist Tue Sep 9 17:16:16 2003
|
|
|
++++ lib/RT/User_Overlay.pm Tue Sep 9 17:18:24 2003
|
|
|
+@@ -279,7 +279,7 @@
|
|
|
#If the create failed.
|
|
|
unless ($id) {
|
|
|
+ $RT::Handle->Rollback();
|
|
|
- $RT::Logger->error("Could not create a new user - " .join('-'. %args));
|
|
|
+ $RT::Logger->error("Could not create a new user - " .join('-', %args));
|
|
|
|
|
|
@@ -121,16 +113,21 @@
|
|
|
<%ARGS>
|
|
|
$user => ""
|
|
|
$pass => undef
|
|
|
---- lib/RT/Attachment_Overlay.pm.dist 2003-08-06 13:01:15.000000000 +0200
|
|
|
-+++ lib/RT/Attachment_Overlay.pm 2003-08-06 13:01:32.000000000 +0200
|
|
|
-@@ -313,7 +313,9 @@
|
|
|
+--- lib/RT/Attachment_Overlay.pm.dist 2003-09-08 20:18:38.000000000 +0200
|
|
|
++++ lib/RT/Attachment_Overlay.pm 2003-09-09 17:28:52.000000000 +0200
|
|
|
+@@ -318,10 +318,11 @@
|
|
|
# If we somehow fail to do the decode, at least push out the raw bits
|
|
|
eval {return( Encode::decode_utf8($content))} || return ($content);
|
|
|
}
|
|
|
-- Encode::from_to($content, 'utf8' => $enc);
|
|
|
+-
|
|
|
+- eval { Encode::from_to($content, 'utf8' => $enc);};
|
|
|
+- if ($@) {
|
|
|
+- $RT::Logger->error("Could not convert attachment from assumed utf8 to '$enc' :".$@);
|
|
|
+ if (!$enc) {
|
|
|
-+ eval {Encode::from_to($content, 'utf8' => $enc);}
|
|
|
-+ }
|
|
|
++ eval { Encode::from_to($content, 'utf8' => $enc);};
|
|
|
++ if ($@) {
|
|
|
++ $RT::Logger->error("Could not convert attachment from assumed utf8 to '$enc' :".$@);
|
|
|
++ }
|
|
|
+ }
|
|
|
return $content;
|
|
|
}
|
|
|
-
|