Merge branch '1.6.x'

This commit is contained in:
Alexey Sokolov
2016-02-04 23:42:50 +00:00
2 changed files with 5 additions and 1 deletions

View File

@@ -7,6 +7,10 @@
<div class="section">
<input type="hidden" name="submitted" value="1" />
<!-- Trick Firefox into NOT autofilling password to "change password" field. It will autofill username and password to these useless fields instead. See issue #1163 -->
<input name="userdummy" type="text" style="display: none"/>
<input name="passworddummy" type="password" style="display: none"/>
<h3>Authentication</h3>
<div class="sectionbg">
<div class="sectionbody">

View File

@@ -1547,7 +1547,7 @@ class CWebAdminMod : public CModule {
CUser* pNewUser = GetNewUser(WebSock, pUser);
if (!pNewUser) {
WebSock.PrintErrorPage("Invalid user settings");
// GetNewUser already called WebSock.PrintErrorPage()
return true;
}