Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 2116)
+++ branches/2.8.x/CHANGELOG	(revision 2117)
@@ -11,6 +11,8 @@
 ! = Update/Change
 ===============================================================================
 
+28 Dec-2014 Build 2117 Manuela v.d.Decken(DarkViper)
+! framework/SqlImport updatet for new phpMAdmin field formats
 01 Dec-2014 Build 2116 Manuela v.d.Decken(DarkViper)
 ! recoded main language files into utf-8
 - removed old array structure (see deprecated list #2 from 2010)
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 2116)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 2117)
@@ -51,5 +51,5 @@
 
 // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
 if(!defined('VERSION')) define('VERSION', '2.8.4');
-if(!defined('REVISION')) define('REVISION', '2116');
+if(!defined('REVISION')) define('REVISION', '2117');
 if(!defined('SP')) define('SP', '');
Index: branches/2.8.x/wb/framework/SqlImport.php
===================================================================
--- branches/2.8.x/wb/framework/SqlImport.php	(revision 2116)
+++ branches/2.8.x/wb/framework/SqlImport.php	(revision 2117)
@@ -206,20 +206,22 @@
         /* ***  ATTENTION:: Do Not Change The Order Of Search-Replace Statements !! *** */
         // define basic array of searches
         $aSearch[] = '/\{TABLE_PREFIX\}/';                                        /* step 0 */
-        $aSearch[] = '/\{FIELD_COLLATION\}/';                                     /* step 1 */
-        $aSearch[] = '/\{TABLE_ENGINE\}/';                                        /* step 2 */
-        $aSearch[] = '/\{TABLE_ENGINE=([a-zA-Z_0-9]*)\}/';                        /* step 3 */
-        $aSearch[] = '/\{CHARSET\}/';                                             /* step 4 */
-        $aSearch[] = '/\{COLLATION\}/';                                           /* step 5 */
+        $aSearch[] = '/\{FIELD_CHARSET\}/';                                       /* step 1 */
+        $aSearch[] = '/\{FIELD_COLLATION\}/';                                     /* step 2 */
+        $aSearch[] = '/\{TABLE_ENGINE\}/';                                        /* step 3 */
+        $aSearch[] = '/\{TABLE_ENGINE=([a-zA-Z_0-9]*)\}/';                        /* step 4 */
+        $aSearch[] = '/\{CHARSET\}/';                                             /* step 5 */
+        $aSearch[] = '/\{COLLATION\}/';                                           /* step 6 */
         // get from addReplacements
         $aReplace = $this->aReplacements['value'];
         // define basic array of replacements
         $aReplace[] = $this->sTablePrefix;                                        /* step 0 */
-        $aReplace[] = ' COLLATE {COLLATION}';                                     /* step 1 */
-        $aReplace[] = ' {TABLE_ENGINE='.$this->sEngine.'}';                       /* step 2 */
-        $aReplace[] = ' ENGINE=$1 DEFAULT CHARSET={CHARSET} COLLATE={COLLATION}'; /* step 3 */
-        $aReplace[] = $sCharset;                                                  /* step 4 */
-        $aReplace[] = $this->sCollation;                                          /* step 5 */
+        $aReplace[] = ' CHARACTER SET {CHARSET}';                                 /* step 1 */
+        $aReplace[] = ' COLLATE {COLLATION}';                                     /* step 2 */
+        $aReplace[] = ' {TABLE_ENGINE='.$this->sEngine.'}';                       /* step 3 */
+        $aReplace[] = ' ENGINE=$1 DEFAULT CHARSET={CHARSET} COLLATE={COLLATION}'; /* step 4 */
+        $aReplace[] = $sCharset;                                                  /* step 5 */
+        $aReplace[] = $this->sCollation;                                          /* step 6 */
 
         $sql = ''; // buffer for statements
         $aSql = file($this->sStructFile, FILE_SKIP_EMPTY_LINES|FILE_IGNORE_NEW_LINES);