Handly explicit collations matching the default collation (see #7979).

contao · Aug 25, 2015 · 587fcac · taca · Aug 26, 2015 · leofeyer
1 parent e11027c
commit 587fcac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/system/docs/CHANGELOG.md b/system/docs/CHANGELOG.md
@@ -4,6 +4,9 @@ Contao Open Source CMS changelog
 Version 3.5.3 (2015-XX-XX)
 --------------------------
 
+### Fixed
+Handly explicit collations matching the default collation (see #7979).
+
 ### Fixed
 Fix the duplicate content check in the front end controller (see #7661).
 

diff --git a/system/modules/core/library/Contao/Database/Installer.php b/system/modules/core/library/Contao/Database/Installer.php
@@ -157,7 +157,7 @@ protected function compileCommands()
 					{
 						$return['ALTER_ADD'][] = 'ALTER TABLE `'.$k.'` ADD '.$vv.';';
 					}
-					elseif ($sql_current[$k]['TABLE_FIELDS'][$kk] != $vv)
+					elseif ($sql_current[$k]['TABLE_FIELDS'][$kk] != $vv && $sql_current[$k]['TABLE_FIELDS'][$kk] != str_replace(' COLLATE ' . \Config::get('dbCollation'), '', $vv))
 					{
 						$return['ALTER_CHANGE'][] = 'ALTER TABLE `'.$k.'` CHANGE `'.$kk.'` '.$vv.';';
 					}