From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Sun, 6 Jan 2013 22:03:02 +0000 (-0800)
Subject: Merge pull request #632 from owncloud/fix_629
X-Git-Tag: v5.0.0alpha1~256
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7ca740fa3deb0ca9844afe6e91a622d5bf7c6c58;p=nextcloud-server.git

Merge pull request #632 from owncloud/fix_629

fix pattern for database names - #629
---

7ca740fa3deb0ca9844afe6e91a622d5bf7c6c58
diff --cc core/templates/installation.php
index 28fbf29b540,3b81d890cf7..3128c4f2e70
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@@ -111,9 -109,9 +111,9 @@@
  				<label for="dbpass" class="infield"><?php echo $l->t( 'Database password' ); ?></label>
  				<input type="password" name="dbpass" id="dbpass" value="<?php print OC_Helper::init_var('dbpass'); ?>" />
  			</p>
 -			<p class="infield">
 +			<p class="infield groupmiddle">
  				<label for="dbname" class="infield"><?php echo $l->t( 'Database name' ); ?></label>
- 				<input type="text" name="dbname" id="dbname" value="<?php print OC_Helper::init_var('dbname'); ?>" autocomplete="off" pattern="[0-9a-zA-Z$_]+" />
+ 				<input type="text" name="dbname" id="dbname" value="<?php print OC_Helper::init_var('dbname'); ?>" autocomplete="off" pattern="[0-9a-zA-Z$_-]+" />
  			</p>
  		</div>
  		<?php endif; ?>