Merge branch '2017.12' into 2018.09

ezsystems · Jan 11, 2019 · 0798ca2 · 0798ca2
2 parents 7554cf0 + b9435eb
commit 0798ca2
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/kernel/setup/steps/ezstep_installer.php b/kernel/setup/steps/ezstep_installer.php
@@ -489,12 +489,11 @@ function checkDatabaseRequirements( $dbCharset = false, $overrideDBParameters =
             $checkedCharset = $db->checkCharset( $charsetsList, $currentCharset );
             if ( $checkedCharset === false )
             {
-                // If the current charset is utf-8 we use that instead
-                // since it can represent any character possible in the chosen languages
-                if ( $currentCharset == 'utf-8' )
+                // If the current charset is utf-8 or utf8mb4 we use that instead
+                // since they can represent any character possible in the chosen languages
+                if ( in_array( $currentCharset, array( 'utf-8', 'utf8mb4' ) ) )
                 {
-                    $charset = 'utf-8';
-                    $result['site_charset'] = $charset;
+                    $result['site_charset'] = 'utf-8';
                 }
                 else
                 {