Merge branch '1.6.x'

This commit is contained in:
Alexey Sokolov
2015-07-07 20:08:01 +01:00
+1 -4
View File
@@ -653,10 +653,7 @@ bool CHTTPSock::PrintErrorPage(unsigned int uStatusId, const CString& sStatusMsg
"<h1>" + sStatusMsg.Escape_n(CString::EHTML) + "</h1>\r\n"
"<p>" + sMessage.Escape_n(CString::EHTML) + "</p>\r\n"
"<hr/>\r\n"
"<address>" +
CZNC::GetTag(false, /* bHTML = */ true) +
" at " + GetLocalIP().Escape_n(CString::EHTML) + " Port " + CString(GetLocalPort()) +
"</address>\r\n"
"<p>" + CZNC::GetTag(false, /* bHTML = */ true) + "</p>\r\n"
"</body>\r\n"
"</html>\r\n";