Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1590)
+++ branches/2.8.x/CHANGELOG	(revision 1591)
@@ -11,6 +11,8 @@
 ! = Update/Change
 
 =========================== add small Features 2.8.2 ==========================
+31 Jan-2012 Build 1591 Werner v.d.Decken(DarkViper)
+# little Regex-fix in database::SqlImport().
 25 Jan-2012 Build 1590 Werner v.d.Decken(DarkViper)
 ! mod form: added request var to submit a request identifier.
 ! argument ?fri=12345 on GET-view will submit 'FormRequestId: 12345' by email
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1590)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1591)
@@ -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.2');
-if(!defined('REVISION')) define('REVISION', '1590');
+if(!defined('REVISION')) define('REVISION', '1591');
 if(!defined('SP')) define('SP', 'SP2');
Index: branches/2.8.x/wb/framework/class.database.php
===================================================================
--- branches/2.8.x/wb/framework/class.database.php	(revision 1590)
+++ branches/2.8.x/wb/framework/class.database.php	(revision 1591)
@@ -286,16 +286,16 @@
  * Import a standard *.sql dump file
  * @param string $sSqlDump link to the sql-dumpfile
  * @param string $sTablePrefix
+ * @param bool $bPreserve set to true will ignore all DROP TABLE statements
  * @param string $sTblEngine
  * @param string $sTblCollation
- * @param bool $bPreserve set to true will ignore all DROP TABLE statements
  * @return boolean true if import successful
  */
 	public function SqlImport($sSqlDump,
 	                          $sTablePrefix = '',
+	                          $bPreserve = true,
 	                          $sTblEngine = 'ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci',
-	                          $sTblCollation = ' collate utf8_unicode_ci',
-	                          $bPreserve = true)
+	                          $sTblCollation = ' collate utf8_unicode_ci')
 	{
 		$retval = true;
 		$this->error = '';
@@ -305,7 +305,7 @@
 		$aSql = file($sSqlDump);
 		while ( sizeof($aSql) > 0 ) {
 			$sSqlLine = trim(array_shift($aSql));
-			if (preg_match('/^[-\/].+/', $sSqlLine)) {
+			if (!preg_match('/^[-\/]+.*/', $sSqlLine)) {
 				$sql = $sql.' '.$sql_line;
 				if ((substr($sql,-1,1) == ';')) {
 					$sql = trim(str_replace( $aSearch, $aReplace, $sql));