diff options
| author | Adam <Adam@anope.org> | 2012-02-24 14:54:44 -0500 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2012-02-24 14:54:44 -0500 |
| commit | 601dc41bafad99d6f73e8957c2ac0337b94b0288 (patch) | |
| tree | 3fe0549752c725d4d3451b53c24665ada054db90 | |
| parent | 2337b7717db05e0c8b53da2d61b5a66f58cc0297 (diff) | |
| parent | fde40dee7a491d55d2974a34de226579aa43701b (diff) | |
Merge branch '1.9' of anope.git.sf.net:/gitroot/anope/anope into 1.9
| -rw-r--r-- | modules/commands/cs_register.cpp | 2 | ||||
| -rw-r--r-- | modules/commands/os_stats.cpp | 2 | ||||
| -rw-r--r-- | src/users.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/modules/commands/cs_register.cpp b/modules/commands/cs_register.cpp index 9cf5a7a9b..633364d31 100644 --- a/modules/commands/cs_register.cpp +++ b/modules/commands/cs_register.cpp @@ -123,7 +123,7 @@ class CommandCSRegister : public Command "NOTICE: In order to register a channel, you must have\n" "first registered your nickname. If you haven't,\n" "\002%s%s HELP\002 for information on how to do so."), - source.owner->nick.c_str(), source.owner->nick.c_str(), Config->UseStrictPrivMsgString.c_str(), source.owner->nick.c_str(), Config->UseStrictPrivMsgString.c_str(), source.owner->nick.c_str()); + source.owner->nick.c_str(), source.owner->nick.c_str(), Config->UseStrictPrivMsgString.c_str(), source.owner->nick.c_str(), Config->UseStrictPrivMsgString.c_str(), Config->NickServ.c_str()); return true; } }; diff --git a/modules/commands/os_stats.cpp b/modules/commands/os_stats.cpp index 85eed7072..afa3b7e19 100644 --- a/modules/commands/os_stats.cpp +++ b/modules/commands/os_stats.cpp @@ -123,7 +123,7 @@ class CommandOSStats : public Command { Anope::string buf; for (std::set<Anope::string>::iterator it = Capab.begin(); it != Capab.end(); ++it) - buf += *it; + buf += " " + *it; if (!buf.empty()) buf.erase(buf.begin()); diff --git a/src/users.cpp b/src/users.cpp index 661c75671..4e6f4e1c6 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -835,7 +835,7 @@ User *do_nick(const Anope::string &source, const Anope::string &nick, const Anop user->SetVIdent(username); user->SetModesInternal(modes.c_str()); - Log(user, "connect") << (!vhost.empty() ? Anope::string("(") + vhost + ")" : "") << " (" << user->realname << ") " << user->ip << "connected to the network (" << serv->GetName() << ")"; + Log(user, "connect") << (!vhost.empty() ? Anope::string("(") + vhost + ")" : "") << " (" << user->realname << ") " << user->ip << " connected to the network (" << serv->GetName() << ")"; bool exempt = false; if (user->server && user->server->IsULined()) |