diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-05-17 22:17:31 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-05-17 22:17:31 +0200 |
| commit | 3d713e711bc00ce3f2615415307f26cfff518a36 (patch) | |
| tree | 2798c623ffa0cbaec5eabea652230ee823936a27 /core/templates | |
| parent | a5f0ac811fe1c156cf6b6ce5d97c21e77f3f5871 (diff) | |
| parent | fbe0d0d4fd1bb7d287a9cff57637b02c34a83a56 (diff) | |
| download | nextcloud-server-3d713e711bc00ce3f2615415307f26cfff518a36.tar.gz nextcloud-server-3d713e711bc00ce3f2615415307f26cfff518a36.zip | |
Merge branch 'master' into oc_error
Diffstat (limited to 'core/templates')
| -rw-r--r-- | core/templates/layout.user.php | 2 | ||||
| -rw-r--r-- | core/templates/login.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index b832ac2636f..e9d105ed043 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -30,7 +30,7 @@ <header><div id="header"> <a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img class="svg" src="<?php echo image_path('', 'logo-wide.svg'); ?>" alt="ownCloud" /></a> <form class="searchbox" action="#" method="post"> - <input id="searchbox" class="svg" type="search" name="query" value="<?php if(isset($_POST['query'])){echo $_POST['query'];};?>" autocomplete="off" /> + <input id="searchbox" class="svg" type="search" name="query" value="<?php if(isset($_POST['query'])){echo htmlentities($_POST['query']);};?>" autocomplete="off" /> </form> <a id="logout" href="<?php echo link_to('', 'index.php'); ?>?logout=true"><img class="svg" alt="<?php echo $l->t('Log out');?>" title="<?php echo $l->t('Log out');?>" src="<?php echo image_path('', 'actions/logout.svg'); ?>" /></a> </div></header> 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> |