Fix: recovers encode and collate of database
This commit is contained in:
parent
31ad232a2a
commit
aff014f7bb
@ -184,10 +184,14 @@ local $cfile = $cfiledir."conf.php";
|
|||||||
local $oldcfile = &transname();
|
local $oldcfile = &transname();
|
||||||
local $olddocdir = &transname();
|
local $olddocdir = &transname();
|
||||||
local $url;
|
local $url;
|
||||||
|
|
||||||
$tmpl = &get_template($d->{'template'});
|
$tmpl = &get_template($d->{'template'});
|
||||||
$charset = $tmpl->{'mysql_charset'};
|
$mycharset = $tmpl->{'mysql_charset'};
|
||||||
$collate = $tmpl->{'mysql_collate'};
|
$mycollate = $tmpl->{'mysql_collate'};
|
||||||
$encoding = $tmpl->{'postgres_encoding'};
|
$pgcharset = $tmpl->{'postgres_encoding'};
|
||||||
|
$charset = $dbtype eq "mysql" ? $mycharset : $pgcharset;
|
||||||
|
$collate = $dbtype eq "mysql" ? $mycollate : "C";
|
||||||
|
|
||||||
$path = &script_path_url($d, $opts);
|
$path = &script_path_url($d, $opts);
|
||||||
if ($path =~ /^https:/) {
|
if ($path =~ /^https:/) {
|
||||||
$url = "https://$d->{'dom'}";
|
$url = "https://$d->{'dom'}";
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user