From: Max Kanat-Alexander <mkanat@bugzilla.org>
Date: Wed, 17 Aug 2011 00:42:54 +0000 (-0700)
Subject: Bug 655472: Print out localconfig as UTF-8 so we don't mangle UTF-8 comments.
X-Git-Tag: bugzilla-4.2rc1~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a19a89b719051f356cf16060b35be9bc9aa6cb01;p=thirdparty%2Fbugzilla.git

Bug 655472: Print out localconfig as UTF-8 so we don't mangle UTF-8 comments.
r=LpSolit, a=LpSolit
---

diff --git a/Bugzilla/Install/Localconfig.pm b/Bugzilla/Install/Localconfig.pm
index 3ce12207e8..1ee7aca673 100644
--- a/Bugzilla/Install/Localconfig.pm
+++ b/Bugzilla/Install/Localconfig.pm
@@ -245,7 +245,8 @@ sub update_localconfig {
     # Move any custom or old variables into a separate file.
     if (scalar @old_vars) {
         my $filename_old = "$filename.old";
-        open(my $old_file, ">>$filename_old") || die "$filename_old: $!";
+        open(my $old_file, ">>:utf8", $filename_old) 
+            or die "$filename_old: $!";
         local $Data::Dumper::Purity = 1;
         foreach my $var (@old_vars) {
             print $old_file Data::Dumper->Dump([$localconfig->{$var}], 
@@ -259,7 +260,7 @@ sub update_localconfig {
     }
 
     # Re-write localconfig
-    open(my $fh, ">$filename") || die "$filename: $!";
+    open(my $fh, ">:utf8", $filename) or die "$filename: $!";
     foreach my $var (LOCALCONFIG_VARS) {
         my $name = $var->{name};
         my $desc = install_string("localconfig_$name", { root => ROOT_USER });