]> git.joonet.de Git - adminer.git/commitdiff
Remove newline before error message
authorJakub Vrana <jakub@vrana.cz>
Mon, 8 Feb 2021 15:06:22 +0000 (16:06 +0100)
committerJakub Vrana <jakub@vrana.cz>
Mon, 8 Feb 2021 15:06:22 +0000 (16:06 +0100)
adminer/include/auth.inc.php

index 0046da7d965154875effb1a3dd0c55b832127836..b8ce053fd17ad11e9c055cbe6a912a5f58193ee9 100644 (file)
@@ -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);
                        }