From: Jakub Vrana <jakub@vrana.cz>
Date: Mon, 8 Feb 2021 15:06:22 +0000 (+0100)
Subject: Remove newline before error message
X-Git-Tag: v4.8.0~46
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=63484fb8754d4c649fbb04f1cc1b765a8b61006b;p=adminer.git

Remove newline before error message
---

diff --git a/adminer/include/auth.inc.php b/adminer/include/auth.inc.php
index 0046da7d..b8ce053f 100644
--- a/adminer/include/auth.inc.php
+++ b/adminer/include/auth.inc.php
@@ -119,7 +119,7 @@ function auth_error($error) {
 			$password = get_password();
 			if ($password !== null) {
 				if ($password === false) {
-					$error .= '<br>' . lang('Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.', target_blank(), '<code>permanentLogin()</code>');
+					$error .= ($error ? '<br>' : '') . lang('Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.', target_blank(), '<code>permanentLogin()</code>');
 				}
 				set_password(DRIVER, SERVER, $_GET["username"], null);
 			}