Merge remote-tracking branch 'origin/3.3.5' into 4.3.4

This commit is contained in:
DDuarte committed 2014-10-19 00:22:33 +01:00
commit eb68b11627
2 files changed
+5 -5

No files matched your search

+3 -3
View File
@@ -1964,12 +1964,12 @@ public:
// we have to manually set the string for mutedate
time_t sqlTime = fields[0].GetUInt32();
struct tm* timeinfo;
tm timeinfo;
char buffer[80];
// set it to string
timeinfo = localtime_r(&sqlTime);
strftime(buffer, sizeof(buffer),"%Y-%m-%d %I:%M%p", timeinfo);
localtime_r(&sqlTime, &timeinfo);
strftime(buffer, sizeof(buffer),"%Y-%m-%d %I:%M%p", &timeinfo);
handler->PSendSysMessage(LANG_COMMAND_MUTEHISTORY_OUTPUT, buffer, fields[1].GetUInt32(), fields[2].GetCString(), fields[3].GetCString());
} while (result->NextRow());