1
0
mirror of https://github.com/processwire/processwire.git synced 2025-08-09 00:06:55 +02:00

Merge recent changes from devns branch

This commit is contained in:
Ryan Cramer
2016-09-22 12:46:59 -04:00
parent bac5b0de5d
commit ee89ddcea5
45 changed files with 694 additions and 182 deletions

View File

@@ -870,7 +870,12 @@ class Installer {
if($options['dbCharset'] != 'utf8') {
$replace['CHARSET=utf8'] = "CHARSET=$options[dbCharset]";
if(strtolower($options['dbCharset']) === 'utf8mb4') {
$replace['(255)'] = '(250)'; // max ley length in utf8mb4 is 1000 (250 * 4)
if(strtolower($options['dbEngine']) === 'innodb') {
$replace['(255)'] = '(191)';
$replace['(250)'] = '(191)';
} else {
$replace['(255)'] = '(250)'; // max ley length in utf8mb4 is 1000 (250 * 4)
}
}
$this->warn("Character set has been changed to '$options[dbCharset]', please keep an eye out for issues.");
}