summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam <Adam@anope.org>2011-02-17 14:32:51 -0500
committerAdam <Adam@anope.org>2011-02-17 14:32:51 -0500
commitf38fe242cda9cbe8df9b055ed1f2185468d6d018 (patch)
tree4a247c7c0c0f23fd9469a4ff78619dc014056b2f
parent536ea2189ae1ff8bf05583ed03fac86797616ac9 (diff)
parentab0422b4d4bc8c78ec8c0cae3eccd8f330a87186 (diff)
Merge branch '1.9' of anope.git.sf.net:/gitroot/anope/anope into 1.9
-rw-r--r--modules/core/ns_identify.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/core/ns_identify.cpp b/modules/core/ns_identify.cpp
index c9446ade5..f2960c0ff 100644
--- a/modules/core/ns_identify.cpp
+++ b/modules/core/ns_identify.cpp
@@ -77,8 +77,6 @@ class CommandNSIdentify : public Command
u->UpdateHost();
- FOREACH_MOD(I_OnNickIdentify, OnNickIdentify(u));
-
Log(LOG_COMMAND, u, this) << "and identified for account " << u->Account()->display;
source.Reply(_("Password accepted - you are now recognized."));
if (ircd->vhost)
@@ -86,6 +84,8 @@ class CommandNSIdentify : public Command
if (Config->NSModeOnID)
do_setmodes(u);
+ FOREACH_MOD(I_OnNickIdentify, OnNickIdentify(u));
+
if (Config->NSForceEmail && u->Account() && u->Account()->email.empty())
{
source.Reply(_("You must now supply an e-mail for your nick.\n"