Merge branch '1.6.x'

This commit is contained in:
Alexey Sokolov
2015-04-16 01:24:43 +01:00
3 changed files with 10 additions and 5 deletions

View File

@@ -1625,8 +1625,7 @@ static void AddCommandHelp(CTable& Table, const CString& sCmd, const CString& sA
{
if (sFilter.empty() || sCmd.StartsWith(sFilter) || sCmd.AsLower().WildCmp(sFilter.AsLower())) {
Table.AddRow();
Table.SetCell("Command", sCmd);
Table.SetCell("Arguments", sArgs);
Table.SetCell("Command", sCmd + " " + sArgs);
Table.SetCell("Description", sDesc);
}
}
@@ -1634,7 +1633,6 @@ static void AddCommandHelp(CTable& Table, const CString& sCmd, const CString& sA
void CClient::HelpUser(const CString& sFilter) {
CTable Table;
Table.AddColumn("Command");
Table.AddColumn("Arguments");
Table.AddColumn("Description");
if (sFilter.empty()) {