Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	(revision 798)
+++ trunk/CHANGELOG	(revision 799)
@@ -10,8 +10,10 @@
 # = Bugfix
 ! = Update/Change
 
-------------------------------------- 2.7.0 -------------------------------------
-04-Apr-2008 Thomas Hornik
+------------------------------------- 2.7.0 -------------------------------------
+05-Apr-2008 Christian Sommer
+!	allowed the character "-" to be used in database names
+04-Apr-2008 Thomas Hornik
 #	fixed: Language-redirect removed query-string from URL
 04-Apr-2008 Christian Sommer
 !	set WB version to 2.7 (RC3) for the next upcoming release candidate
Index: trunk/wb/install/save.php
===================================================================
--- trunk/wb/install/save.php	(revision 798)
+++ trunk/wb/install/save.php	(revision 799)
@@ -226,9 +226,9 @@
 	set_error('Please enter a database name', 'database_name');
 } else {
 	// make sure only allowed characters are specified
-	if(preg_match('/[^a-z0-9_]+/i', $_POST['database_name'])) {
+	if(preg_match('/[^a-z0-9_-]+/i', $_POST['database_name'])) {
 		// contains invalid characters (only a-z, A-Z, 0-9 and _ allowed to avoid problems with table/field names)
-		set_error('Only characters a-z, A-Z, 0-9 and _ allowed as database name.', 'database_name');
+		set_error('Only characters a-z, A-Z, 0-9, - and _ allowed in database name.', 'database_name');
 	}
 	$database_name = $_POST['database_name'];
 }
@@ -235,7 +235,7 @@
 // Get table prefix
 if(preg_match('/[^a-z0-9_]+/i', $_POST['table_prefix'])) {
 	// contains invalid characters (only a-z, A-Z, 0-9 and _ allowed to avoid problems with table/field names)
-	set_error('Only characters a-z, A-Z, 0-9 and _ allowed as table_prefix.', 'table_prefix');
+	set_error('Only characters a-z, A-Z, 0-9 and _ allowed in table_prefix.', 'table_prefix');
 } else {
 	$table_prefix = $_POST['table_prefix'];
 }
@@ -350,7 +350,7 @@
 }
 
 // Try to create the database
-mysql_query('CREATE DATABASE '.$database_name);
+mysql_query('CREATE DATABASE `'.$database_name.'`');
 
 // Close the mysql connection
 mysql_close();
Index: trunk/wb/install/index.php
===================================================================
--- trunk/wb/install/index.php	(revision 798)
+++ trunk/wb/install/index.php	(revision 799)
@@ -336,7 +336,7 @@
 			</td>
 		</tr>
 		<tr>
-			<td style="color: #666666;">Database Name:<br />[a-zA-Z0-9_]</td>
+			<td style="color: #666666;">Database Name:<br />[a-zA-Z0-9_-]</td>
 			<td>
 				<input <?php echo field_error('database_name');?> type="text" tabindex="8" name="database_name" style="width: 98%;" value="<?php if(isset($_SESSION['database_name'])) { echo $_SESSION['database_name']; } else { echo 'wb'; } ?>" />
 			</td>