* Fixed bug #7841: Remove COLLATE statement when creating new tables with the Install...
authorMichael Stucki <michael.stucki@typo3.org>
Tue, 1 Apr 2008 19:38:06 +0000 (19:38 +0000)
committerMichael Stucki <michael.stucki@typo3.org>
Tue, 1 Apr 2008 19:38:06 +0000 (19:38 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@3501 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
t3lib/class.t3lib_install.php

index 5c0274a..ddd001c 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-01  Michael Stucki  <michael@typo3.org>
+
+       * Fixed bug #7841: Remove COLLATE statement when creating new tables with the Install Tool
+
 2008-04-01  Ingo Renner <ingo@typo3.org>
 
        * Fixed bug #5998: Crawler/Index Config: hidden records are re-indexed, credits Christian Kuhn
index 5ac005f..1bff8fe 100755 (executable)
@@ -702,6 +702,9 @@ class t3lib_install {
                                                        $statement = 'CREATE TABLE '.$table." (\n".implode(",\n",$whole_table)."\n)";
                                                        if ($info['extra']) {
                                                                foreach ($info['extra'] as $k=>$v) {
+                                                                       if ($k=='COLLATE') {
+                                                                               continue;       // TODO: collation support is currently disabled (needs more testing)
+                                                                       }
                                                                        $statement.= ' '.$k.'='.$v;     // Add extra attributes like ENGINE, CHARSET, etc.
                                                                }
                                                        }