Use the remote channel's capitalization on a losing TS merge

[user/henk/code/inspircd.git] / src / commands / cmd_links.cpp

diff --git a/src/commands/cmd_links.cpp b/src/commands/cmd_links.cpp
index d722fa65d0b095a2ba13b5e075e7829e053c58c0..951c798eafc5d6b836532549345febeec94c7833 100644 (file)
--- a/src/commands/cmd_links.cpp
+++ b/src/commands/cmd_links.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -48,7 +48,7 @@ class CommandLinks : public Command
  */
 CmdResult CommandLinks::Handle (const std::vector<std::string>&, User *user)
 {
-       user->WriteNumeric(364, "%s %s %s :0 %s",user->nick.c_str(),ServerInstance->Config->ServerName,ServerInstance->Config->ServerName,ServerInstance->Config->ServerDesc);
+       user->WriteNumeric(364, "%s %s %s :0 %s",user->nick.c_str(),ServerInstance->Config->ServerName.c_str(),ServerInstance->Config->ServerName.c_str(),ServerInstance->Config->ServerDesc.c_str());
        user->WriteNumeric(365, "%s * :End of /LINKS list.",user->nick.c_str());
        return CMD_SUCCESS;
 }