aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTomatoes <diredarknil@gmail.com>2016-07-29 13:54:14 -0500
committerNaios <naios-dev@live.de>2016-07-30 22:37:35 +0200
commit29826a92ef4cf7896e3be69757b015d47f3db006 (patch)
tree8ec0fecafe76bd0f5619e37c638ea964e403f999 /src
parent2967bf59b4a47837b85c995b732a6761c9c35f7e (diff)
Core/Ticket System: Ticket comment visual output bug
* Commenting on a ticket no longer sends the GM's name to the ticket handler for assignment * Closes #16091 * Closes #17686 Signed-off-by: Naios <naios-dev@live.de>
Diffstat (limited to 'src')
-rw-r--r--src/server/scripts/Commands/cs_ticket.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/server/scripts/Commands/cs_ticket.cpp b/src/server/scripts/Commands/cs_ticket.cpp
index 899c5615206..26f712eb8ef 100644
--- a/src/server/scripts/Commands/cs_ticket.cpp
+++ b/src/server/scripts/Commands/cs_ticket.cpp
@@ -199,7 +199,12 @@ public:
ticket->SaveToDB(trans);
sTicketMgr->UpdateLastChange();
- std::string msg = ticket->FormatMessageString(*handler, NULL, ticket->GetAssignedToName().c_str(), NULL, NULL, NULL);
+ std::string msg = [&] {
+ std::string const assignedName = ticket->GetAssignedToName();
+ return ticket->FormatMessageString(*handler, nullptr,
+ assignedName.empty() ? nullptr : assignedName.c_str(), nullptr, nullptr, nullptr);
+ }();
+
msg += handler->PGetParseString(LANG_COMMAND_TICKETLISTADDCOMMENT, player ? player->GetName().c_str() : "Console", comment);
handler->SendGlobalGMSysMessage(msg.c_str());