From: Robin Appelman <icewind1991@gmail.com>
Date: Thu, 8 Jul 2010 18:31:02 +0000 (+0200)
Subject: Merge commit 'refs/merge-requests/23' of git://gitorious.org/owncloud/owncloud into... 
X-Git-Tag: v3.0~353^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=32e58512552166e14a94c6ff690f0037c12b92ec;p=nextcloud-server.git

Merge commit 'refs/merge-requests/23' of git://gitorious.org/owncloud/owncloud into merge
---

32e58512552166e14a94c6ff690f0037c12b92ec
diff --cc inc/templates/adminform.php
index 81b02ac45fc,064201e5c81..9846cfee6d3
--- a/inc/templates/adminform.php
+++ b/inc/templates/adminform.php
@@@ -115,9 -115,9 +115,9 @@@ foreach($dbtypes as $dbtype)
  <tr><td></td><td><input type="submit" name="set_config" alt="save" value="save" class="formstyle" /></td></tr>
  </table></form><br/>
  <?php
- if(!$FIRSTRUN and false){//disabled for now?>
+ if(!$FIRSTRUN ){//disabled for now?>
  <br/>
 -<form method="post" enctype="multipart/form-data">
 +<form method="post" enctype="multipart/form-data" action="#">
  <table cellpadding="5" cellspacing="5" border="0" class="loginform">
  <tr><td colspan='2'>Create new user:</td></tr>
  <tr><td>user name</td><td><input type='text' name='new_username' class="formstyle"></input></td></tr>