diff options
| author | Michael Gapczynski <GapczynskiM@gmail.com> | 2012-05-17 15:38:28 -0400 |
|---|---|---|
| committer | Michael Gapczynski <GapczynskiM@gmail.com> | 2012-05-17 15:38:28 -0400 |
| commit | cbfbbe672cb4b1d03269891927edbb6059b67be9 (patch) | |
| tree | 924957a8bbba2e1fb4c87b1a2d8e2e67ac6e4aef /core | |
| parent | cf181e88bb984f728c77ad01dcbcf87f2cc4aa7a (diff) | |
| parent | 6f981738bb5285d01e839ff640c163acf1b2a184 (diff) | |
| download | nextcloud-server-cbfbbe672cb4b1d03269891927edbb6059b67be9.tar.gz nextcloud-server-cbfbbe672cb4b1d03269891927edbb6059b67be9.zip | |
Merge commit 'refs/merge-requests/115' of git://gitorious.org/owncloud/owncloud into merge-requests/115
Conflicts:
apps/files/templates/index.php
Diffstat (limited to 'core')
| -rw-r--r-- | core/templates/login.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/templates/login.php b/core/templates/login.php index 4035dfe8a5a..a40bf5c330a 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -7,7 +7,7 @@ <?php endif; ?> <p class="infield"> <label for="user" class="infield"><?php echo $l->t( 'Username' ); ?></label> - <input type="text" name="user" id="user" value="<?php echo !empty($_POST['user'])?htmlentities($_POST['user']).'"':'" autofocus'; ?> autocomplete="off" required /> + <input type="text" name="user" id="user" value="<?php echo !empty($_POST['user'])?htmlentities($_POST['user'],ENT_COMPAT,'utf-8').'"':'" autofocus'; ?> autocomplete="off" required /> </p> <p class="infield"> <label for="password" class="infield"><?php echo $l->t( 'Password' ); ?></label> |