From 8a3e6636893d1d73bb1c20dd3e1aa3d0a3e4de4f Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Wed, 11 May 2016 14:31:10 +0200
Subject: [PATCH 1/2] Update default_logout.php

---
 modules/mod_login/tmpl/default_logout.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/mod_login/tmpl/default_logout.php b/modules/mod_login/tmpl/default_logout.php
index 01f3d074e2b0f..7265e53085d5f 100644
--- a/modules/mod_login/tmpl/default_logout.php
+++ b/modules/mod_login/tmpl/default_logout.php
@@ -11,14 +11,14 @@
 
 JHtml::_('behavior.keepalive');
 ?>
-<form action="<?php echo JRoute::_(htmlspecialchars(JUri::getInstance()->toString()), true, $params->get('usesecure')); ?>" method="post" id="login-form" class="form-vertical">
+<form action="<?php echo JRoute::_(htmlspecialchars(JUri::getInstance()->toString(), ENT_COMPAT, 'UTF-8'), true, $params->get('usesecure')); ?>" method="post" id="login-form" class="form-vertical">
 <?php if ($params->get('greeting')) : ?>
 	<div class="login-greeting">
-	<?php if ($params->get('name') == 0) : {
-		echo JText::sprintf('MOD_LOGIN_HINAME', htmlspecialchars($user->get('name')));
-	} else : {
-		echo JText::sprintf('MOD_LOGIN_HINAME', htmlspecialchars($user->get('username')));
-	} endif; ?>
+	<?php if ($params->get('name') == 0) : ?>
+		<?php echo JText::sprintf('MOD_LOGIN_HINAME', htmlspecialchars($user->get('name')), ENT_COMPAT, 'UTF-8'); ?>
+	<?php else : ?>
+		<?php echo JText::sprintf('MOD_LOGIN_HINAME', htmlspecialchars($user->get('username')), ENT_COMPAT, 'UTF-8'); ?>
+	<?php endif; ?>
 	</div>
 <?php endif; ?>
 	<div class="logout-button">

From 2f97c4c2478efe033efaafa8c895d0fcef9a18d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wojciech=20Smoli=C5=84ski?= <wojsmol@wp.pl>
Date: Sat, 14 May 2016 12:45:36 +0200
Subject: [PATCH 2/2] fix php errors (#13)

---
 modules/mod_login/tmpl/default_logout.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mod_login/tmpl/default_logout.php b/modules/mod_login/tmpl/default_logout.php
index 7265e53085d5f..42e18bdbbab69 100644
--- a/modules/mod_login/tmpl/default_logout.php
+++ b/modules/mod_login/tmpl/default_logout.php
@@ -15,9 +15,9 @@
 <?php if ($params->get('greeting')) : ?>
 	<div class="login-greeting">
 	<?php if ($params->get('name') == 0) : ?>
-		<?php echo JText::sprintf('MOD_LOGIN_HINAME', htmlspecialchars($user->get('name')), ENT_COMPAT, 'UTF-8'); ?>
+		<?php echo JText::sprintf('MOD_LOGIN_HINAME', htmlspecialchars($user->get('name'), ENT_COMPAT, 'UTF-8')); ?>
 	<?php else : ?>
-		<?php echo JText::sprintf('MOD_LOGIN_HINAME', htmlspecialchars($user->get('username')), ENT_COMPAT, 'UTF-8'); ?>
+		<?php echo JText::sprintf('MOD_LOGIN_HINAME', htmlspecialchars($user->get('username'), ENT_COMPAT, 'UTF-8')); ?>
 	<?php endif; ?>
 	</div>
 <?php endif; ?>