Merge branch 'master' into Item13525

foswiki · Jul 29, 2015 · 0efeab6 · 0efeab6
2 parents d92ffec + fc117ad
commit 0efeab6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/core/lib/Foswiki/Net.pm b/core/lib/Foswiki/Net.pm
@@ -767,7 +767,7 @@ s/([\n\r])(From|To|CC|BCC)(\:\s*)([^\n\r]*)/$1.$2.$3._fixLineLength($4)/geis;
         "====== Sending to $mailer ======\n$header\n======EOM======" );
 
     my $MAIL;
-    open( $MAIL, '|-', $mailer )
+    open( $MAIL, '|-:encoding(utf-8)', $mailer )
       || $this->_logMailError( 'die', "Can't send mail using $mailer" );
     print $MAIL $text;
     close($MAIL);

diff --git a/core/lib/Foswiki/Store.pm b/core/lib/Foswiki/Store.pm
@@ -60,6 +60,7 @@ use Assert;
 
 use Foswiki          ();
 use Foswiki::Sandbox ();
+use HTML::Entities   ();
 
 BEGIN {
     if ( $Foswiki::cfg{UseLocale} ) {
@@ -274,7 +275,7 @@ sub encode {
     return $_[0] unless defined $_[0];
     my $s = $_[0];
     return Encode::encode( $Foswiki::cfg{Store}{Encoding} || 'utf-8',
-        $s, Encode::FB_CROAK );
+        $s, sub { HTML::Entities::encode_entities( chr(shift) ) } );
 }
 
 1;