[Rt-commit] r12569 - in rt/branches/3.8-TESTING: .

[alexmv at bestpractical.com]

Author: alexmv
Date: Tue May 20 18:39:41 2008
New Revision: 12569

Modified:
   rt/branches/3.8-TESTING/   (props changed)
   rt/branches/3.8-TESTING/lib/RT/I18N.pm

Log:
 r32011 at kohr-ah:  chmrr | 2008-05-20 18:39:35 -0400
  * Only wrap encoded versions in quotes if they don't already have them


Modified: rt/branches/3.8-TESTING/lib/RT/I18N.pm
==============================================================================
--- rt/branches/3.8-TESTING/lib/RT/I18N.pm	(original)
+++ rt/branches/3.8-TESTING/lib/RT/I18N.pm	Tue May 20 18:39:41 2008
@@ -341,7 +341,11 @@
         # until this is fixed, we must escape any string containing a comma or semicolon
         # this is only a bandaid
 
-        $enc_str = qq{"$enc_str"} if ($enc_str =~ /[,;]/);                                     
+        # Some _other_ MUAs encode quotes _already_, and double quotes
+        # confuse us a lot, so only quote it if it isn't quoted
+        # already.
+        $enc_str = qq{"$enc_str"} if $enc_str =~ /[,;]/ and $enc_str !~ /^".*"$/;
+
 	$str .= $prefix . $enc_str . $trailing;
     }