From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Mon, 19 May 2014 18:40:55 +0000 (+0200)
Subject: Merge branch 'master' into csrf-on-login-and-logout
X-Git-Tag: v7.0.0alpha2~161^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f8cb8f480346fb36ca18258b902a7157265c8ac7;p=nextcloud-server.git

Merge branch 'master' into csrf-on-login-and-logout

Conflicts:
	core/templates/login.php
---

f8cb8f480346fb36ca18258b902a7157265c8ac7
diff --cc core/templates/login.php
index a7e93a499b5,669d20b32e4..0f25f853b02
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@@ -53,8 -51,7 +53,8 @@@
  		<label for="remember_login"><?php p($l->t('remember')); ?></label>
  		<?php endif; ?>
  		<input type="hidden" name="timezone-offset" id="timezone-offset"/>
 +		<input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>" />
- 		<input type="submit" id="submit" class="login primary" value="<?php p($l->t('Log in')); ?>"/>
+ 		<input type="submit" id="submit" class="login primary" value="<?php p($l->t('Log in')); ?>" disabled="disabled"/>
  	</fieldset>
  </form>
  <?php if (!empty($_['alt_login'])) { ?>