mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

Remove utf8mb4_ready requirement from native -> utf8 upgrade

Browse Source
This commit is contained in:
onli 2020-03-23 17:25:04 +01:00
parent be422b5e83
commit 8a1ab31a66
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
include/functions_upgrader.inc.php
View File

@ -521,29 +521,27 @@ function serendipity_upgrade_native_utf8() {
return false; return false;
} }
if (serendipity_utf8mb4_ready()) { # get all core tables
# get all core tables $tables = serendipity_db_query("SHOW TABLES LIKE '" . str_replace('_', '\_', serendipity_db_escape_string($prefix)) . "%'");
$tables = serendipity_db_query("SHOW TABLES LIKE '" . str_replace('_', '\_', serendipity_db_escape_string($prefix)) . "%'"); if (!is_array($tables)) {
if (!is_array($tables)) { echo 'Could not analyze existing tables via SHOW TABLES, please check permissions.' . $tables;
echo 'Could not analyze existing tables via SHOW TABLES, please check permissions.' . $tables; return false;
return false; }
} # now collect all their columns charsets. We want to see which ones are not utf8 already
# now collect all their columns charsets. We want to see which ones are not utf8 already $targetTables = [];
$targetTables = []; foreach ($tables as $table) {
foreach ($tables as $table) { $table = $table[0];
$table = $table[0]; $columns = serendipity_db_query('SHOW FULL COLUMNS FROM ' . $table);
$columns = serendipity_db_query('SHOW FULL COLUMNS FROM ' . $table); foreach($columns as $column) {
foreach($columns as $column) { if ($column['Collation'] && ( ! stristr($column['Collation'], 'utf8'))) {
if ($column['Collation'] && ( ! stristr($column['Collation'], 'utf8'))) { $targetTables[] = $table;
$targetTables[] = $table;
}
} }
} }
# Good, now we can set it it utf8
foreach ($targetTables AS $table) {
serendipity_db_query('ALTER TABLE `' . $table . '` CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci');
}
return true;
} }
# Good, now we can set it it utf8
foreach ($targetTables AS $table) {
serendipity_db_query('ALTER TABLE `' . $table . '` CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci');
}
return true;
} }