Version 4.1.2
This commit is contained in:
1 parent
3ba79295ee
commit
28bd025b35
1131 files changed
+63658
-20579
No files matched your search
@@ -45,7 +45,7 @@ while ( $table = $tables->fetch_assoc() )
|
||||
|
||||
$definition = \IPS\Db::i()->getTableDefinition( preg_replace( '/^' . $prefix . '/', '', $tableName ), FALSE, TRUE );
|
||||
|
||||
if( isset( $definition['collation'] ) AND mb_strtolower( mb_substr( $definition['collation'], 0, 4 ) !== 'utf8' ) )
|
||||
if( isset( $definition['collation'] ) AND !in_array( $definition['collation'], array( 'utf8_unicode_ci', 'utf8mb4_unicode_ci' ) ) )
|
||||
{
|
||||
$convert = TRUE;
|
||||
break;
|
||||
@@ -55,7 +55,7 @@ while ( $table = $tables->fetch_assoc() )
|
||||
|
||||
while ( $column = $columns->fetch_assoc() )
|
||||
{
|
||||
if ( $column['Collation'] and mb_strtolower( mb_substr( $column['Collation'], 0, 4 ) !== 'utf8' ) )
|
||||
if ( $column['Collation'] and !in_array( $column['Collation'], array( 'utf8_unicode_ci', 'utf8mb4_unicode_ci' ) ) )
|
||||
{
|
||||
$convert = TRUE;
|
||||
break 2;
|
||||
|
||||
Reference in new issue
Block a user