[Koha-cvs] koha/C4 Interface/CGI/Output.pm Context.pm

[Pierrick LE GALL]

CVSROOT:	/sources/koha
Module name:	koha
Branch: 	
Changes by:	Pierrick LE GALL <plg at savannah.gnu.org>	06/03/15 11:21:56

Modified files:
	C4/Interface/CGI: Output.pm 
	C4             : Context.pm 

Log message:
	bug fixed: utf-8 data where not displayed correctly in screens. Supposing
	your data are truely utf-8 encoded in your database, they should be
	correctly displayed. "set names 'UTF8'" on mysql connection (C4/Context.pm)
	is mandatory and "binmode" to utf8 (C4/Interface/CGI/Output.pm) seemed to
	converted data twice, so it was removed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/C4/Interface/CGI/Output.pm.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/C4/Context.pm.diff?tr1=1.32&tr2=1.33&r1=text&r2=text

Patches:
Index: koha/C4/Context.pm
diff -u koha/C4/Context.pm:1.32 koha/C4/Context.pm:1.33
--- koha/C4/Context.pm:1.32	Fri Mar  3 17:25:01 2006
+++ koha/C4/Context.pm	Wed Mar 15 11:21:56 2006
@@ -15,7 +15,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: Context.pm,v 1.32 2006/03/03 17:25:01 hdl Exp $
+# $Id: Context.pm,v 1.33 2006/03/15 11:21:56 plg Exp $
 
 package C4::Context;
 use strict;
@@ -26,7 +26,7 @@
 	qw($context),
 	qw(@context_stack);
 
-$VERSION = do { my @v = '$Revision: 1.32 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.33 $' =~ /\d+/g;
 		shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
 
 =head1 NAME
@@ -466,7 +466,7 @@
 			    $db_user, $db_passwd);
 	# Koha 3.0 is utf-8, so force utf8 communication between mySQL and koha, whatever the mysql default config.
 	# this is better than modifying my.cnf (and forcing all communications to be in utf8)
-#	$dbh->do("set NAMES 'utf8'");
+	$dbh->do("set NAMES 'utf8'");
 	return $dbh;
 }
 
@@ -780,6 +780,13 @@
 
 =cut
 # $Log: Context.pm,v $
+# Revision 1.33  2006/03/15 11:21:56  plg
+# bug fixed: utf-8 data where not displayed correctly in screens. Supposing
+# your data are truely utf-8 encoded in your database, they should be
+# correctly displayed. "set names 'UTF8'" on mysql connection (C4/Context.pm)
+# is mandatory and "binmode" to utf8 (C4/Interface/CGI/Output.pm) seemed to
+# converted data twice, so it was removed.
+#
 # Revision 1.32  2006/03/03 17:25:01  hdl
 # Bug fixing : a line missed a comment sign.
 #
Index: koha/C4/Interface/CGI/Output.pm
diff -u koha/C4/Interface/CGI/Output.pm:1.3 koha/C4/Interface/CGI/Output.pm:1.4
--- koha/C4/Interface/CGI/Output.pm:1.3	Fri Feb 17 15:28:55 2006
+++ koha/C4/Interface/CGI/Output.pm	Wed Mar 15 11:21:56 2006
@@ -1,6 +1,6 @@
 package C4::Interface::CGI::Output;
 
-# $Id: Output.pm,v 1.3 2006/02/17 15:28:55 tipaul Exp $
+# $Id: Output.pm,v 1.4 2006/03/15 11:21:56 plg Exp $
 
 #package to work around problems in HTTP headers
 # Note: This is just a utility module; it should not be instantiated.
@@ -106,7 +106,6 @@
 
 sub output_html_with_http_headers ($$$) {
     my($query, $cookie, $html) = @_;
-    binmode(STDOUT, ":utf8");
     print $query->header(
 	-type   => guesstype($html),
 	-cookie => $cookie,