1
0
mirror of https://github.com/anope/anope.git synced 2026-07-04 22:53:12 +02:00

Merge branch '1.9' of anope.git.sf.net:/gitroot/anope/anope into 1.9

This commit is contained in:
Adam
2012-02-24 14:54:44 -05:00
3 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -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;
}
};
+1 -1
View File
@@ -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());
+1 -1
View File
@@ -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())