diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2011-09-30 23:48:20 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2011-09-30 23:48:20 +0200 |
| commit | 21a88613a150c550e32d63df9a9ef8bf3d5107d0 (patch) | |
| tree | 45e76fbae9349265489dbebe5aef090f45e49a85 /core/templates/login.php | |
| parent | ddd28aae67d7e67b7e39c1fe58fe52659d1dd755 (diff) | |
| parent | 5fbf378d1021da91977caa6c7df9944c353d4786 (diff) | |
| download | nextcloud-server-21a88613a150c550e32d63df9a9ef8bf3d5107d0.tar.gz nextcloud-server-21a88613a150c550e32d63df9a9ef8bf3d5107d0.zip | |
Merge branch 'lostpassword'
Conflicts:
core/templates/login.php
index.php
lib/util.php
Diffstat (limited to 'core/templates/login.php')
| -rw-r--r-- | core/templates/login.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/templates/login.php b/core/templates/login.php index 641e0adb6e0..6564847014b 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -1,8 +1,8 @@ <form action="index.php" method="post"> <fieldset> - <?php /*if($_['error']): ?> + <?php if($_['error']): ?> <a href="index.php?lostpassword"><?php echo $l->t('Lost your password?'); ?></a> - <?php endif;*/ ?> + <?php endif; ?> <?php if(empty($_['username'])): ?> <input type="text" name="user" id="user" placeholder="<?php echo $l->t( 'Username' ); ?>" value="<?php echo !empty($_POST['user'])?$_POST['user'].'"':'" autofocus'; ?> autocomplete="off" required /> <input type="password" name="password" id="password" placeholder="<?php echo $l->t( 'Password' ); ?>" value="" required <?php echo !empty($_POST['user'])?'autofocus':''; ?> /> |