From aff014f7bb82e258d39ca5501bbe79424ad42b2e Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Fri, 8 Oct 2010 07:29:05 +0000
Subject: [PATCH] Fix: recovers encode and collate of database
---
build/perl/virtualmin/dolibarr.pl | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/build/perl/virtualmin/dolibarr.pl b/build/perl/virtualmin/dolibarr.pl
index 98460047f0c..56ceda03f9d 100644
--- a/build/perl/virtualmin/dolibarr.pl
+++ b/build/perl/virtualmin/dolibarr.pl
@@ -184,10 +184,14 @@ local $cfile = $cfiledir."conf.php";
local $oldcfile = &transname();
local $olddocdir = &transname();
local $url;
+
$tmpl = &get_template($d->{'template'});
-$charset = $tmpl->{'mysql_charset'};
-$collate = $tmpl->{'mysql_collate'};
-$encoding = $tmpl->{'postgres_encoding'};
+$mycharset = $tmpl->{'mysql_charset'};
+$mycollate = $tmpl->{'mysql_collate'};
+$pgcharset = $tmpl->{'postgres_encoding'};
+$charset = $dbtype eq "mysql" ? $mycharset : $pgcharset;
+$collate = $dbtype eq "mysql" ? $mycollate : "C";
+
$path = &script_path_url($d, $opts);
if ($path =~ /^https:/) {
$url = "https://$d->{'dom'}";
--
GitLab