diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-13 16:44:31 -0400 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-13 16:44:31 -0400 |
| commit | e5e7d4a73a9481c3d118d04c561afea5d437290c (patch) | |
| tree | 197da604b3338c2ed6e09a19b68cf0f9c8278140 /core/templates | |
| parent | 926e777061efcc29d293b4af305ca9d0d01f6e22 (diff) | |
| parent | b9f9228a22944184803a8835282862e468812c1d (diff) | |
| download | nextcloud-server-e5e7d4a73a9481c3d118d04c561afea5d437290c.tar.gz nextcloud-server-e5e7d4a73a9481c3d118d04c561afea5d437290c.zip | |
fix merge conflicts
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 c048653cce9..85cf0899792 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -31,7 +31,7 @@ <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" /> </form> - <a id="logout" href="<?php echo link_to('', 'index.php'); ?>?logout=true"><img class="svg" alt="<?php echo $l->t('Log out');?>" src="<?php echo image_path('', 'actions/logout.svg'); ?>" /></a> + <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> <nav><div id="navigation"> diff --git a/core/templates/login.php b/core/templates/login.php index 82222c82129..4ba92221a7d 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'])?$_POST['user'].'"':'" autofocus'; ?> autocomplete="off" required /> + <input type="text" name="user" id="user" value="<?php echo !empty($_POST['user'])?htmlentities($_POST['user']).'"':'" autofocus'; ?> autocomplete="off" required /> </p> <p class="infield"> <label for="password" class="infield"><?php echo $l->t( 'Password' ); ?></label> |