summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsjaz <sjaz@5417fbe8-f217-4b02-8779-1006273d7864>2009-06-20 22:27:44 +0000
committersjaz <sjaz@5417fbe8-f217-4b02-8779-1006273d7864>2009-06-20 22:27:44 +0000
commit28d77b7ebe1ce8a024ed118e8c4e0bb13e628b87 (patch)
treeca764c163c21bb46dbf5ad4f619917709be9539c /src
parentb81d902a2ef1dcb1a4418f6ffc66ec7c1bf5f192 (diff)
Fixes multiple issues with HELP with non-identified nicks. (Thanks Adam!)
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2332 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src')
-rw-r--r--src/core/bs_set.c2
-rw-r--r--src/core/cs_logout.c2
-rw-r--r--src/core/cs_register.c2
-rw-r--r--src/core/ns_info.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/core/bs_set.c b/src/core/bs_set.c
index fc939c5c6..d99bec581 100644
--- a/src/core/bs_set.c
+++ b/src/core/bs_set.c
@@ -149,7 +149,7 @@ class CommandBSSet : public Command
if (subcommand.empty())
{
notice_help(s_BotServ, u, BOT_HELP_SET);
- if (u->nc->IsServicesOper())
+ if (u->nc && u->nc->IsServicesOper())
notice_help(s_BotServ, u, BOT_SERVADMIN_HELP_SET);
}
else if (subcommand == "DONTKICKOPS")
diff --git a/src/core/cs_logout.c b/src/core/cs_logout.c
index ba7c8b8e4..90ba2928b 100644
--- a/src/core/cs_logout.c
+++ b/src/core/cs_logout.c
@@ -97,7 +97,7 @@ class CommandCSLogout : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
- if (u->nc->HasCommand("chanserv/logout"))
+ if (u->nc && u->nc->HasCommand("chanserv/logout"))
notice_help(s_NickServ, u, CHAN_SERVADMIN_HELP_LOGOUT);
else
notice_help(s_NickServ, u, CHAN_HELP_LOGOUT);
diff --git a/src/core/cs_register.c b/src/core/cs_register.c
index 9c1bc6077..7e38a52da 100644
--- a/src/core/cs_register.c
+++ b/src/core/cs_register.c
@@ -129,7 +129,7 @@ class CommandCSRegister : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
- notice_help(s_ChanServ, u, CHAN_HELP_REGISTER);
+ notice_help(s_ChanServ, u, CHAN_HELP_REGISTER, s_ChanServ);
return true;
}
diff --git a/src/core/ns_info.c b/src/core/ns_info.c
index 5fd303d5e..623d2f92d 100644
--- a/src/core/ns_info.c
+++ b/src/core/ns_info.c
@@ -195,7 +195,7 @@ class CommandNSInfo : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
- if (u->nc->IsServicesOper())
+ if (u->nc && u->nc->IsServicesOper())
notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_INFO);
else
notice_help(s_NickServ, u, NICK_HELP_INFO);