Merge pull request #2815 from annando/1609-mysql
We should only use utf8mb4 for dumpsql and new installations
This commit is contained in:
commit
92dac133a0
|
@ -262,7 +262,7 @@ function db_create_table($name, $fields, $verbose, $action, $indexes=null) {
|
||||||
|
|
||||||
if (isset($a->config["system"]["db_charset"]))
|
if (isset($a->config["system"]["db_charset"]))
|
||||||
$charset = $a->config["system"]["db_charset"];
|
$charset = $a->config["system"]["db_charset"];
|
||||||
elseif ($verbose)
|
elseif (!$action) // Used for dumpsql
|
||||||
$charset = "utf8mb4";
|
$charset = "utf8mb4";
|
||||||
else
|
else
|
||||||
$charset = "utf8";
|
$charset = "utf8";
|
||||||
|
|
Loading…
Reference in New Issue
Block a user