diff options
| author | Adam <Adam@anope.org> | 2011-08-21 16:35:22 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2011-08-21 16:35:22 -0400 |
| commit | c996356fab9281e018b78e04e652223817b68230 (patch) | |
| tree | 0bd575ab54742eaa0bf48fa0d31def98bc2a0f1f | |
| parent | d71ae412bb539ee63a2428dca6264d989b5cbc33 (diff) | |
Bugs #1321 & 1322
| -rw-r--r-- | modules/commands/bs_assign.cpp | 2 | ||||
| -rw-r--r-- | src/regchannel.cpp | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/modules/commands/bs_assign.cpp b/modules/commands/bs_assign.cpp index 82eee7914..fcaca4bac 100644 --- a/modules/commands/bs_assign.cpp +++ b/modules/commands/bs_assign.cpp @@ -91,7 +91,7 @@ class CommandBSUnassign : public Command CommandBSUnassign(Module *creator) : Command(creator, "botserv/unassign", 1, 1) { this->SetDesc(_("Unassigns a bot from a channel")); - this->SetSyntax(_("\037channel\037 \037nick\037")); + this->SetSyntax(_("\037channel\037")); } void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) diff --git a/src/regchannel.cpp b/src/regchannel.cpp index ed25ce6bf..160b7102b 100644 --- a/src/regchannel.cpp +++ b/src/regchannel.cpp @@ -207,6 +207,11 @@ ChanAccess *ChannelInfo::GetAccess(unsigned index) AccessGroup ChannelInfo::AccessFor(User *u) { + AccessGroup group; + + if (u == NULL) + return group; + NickCore *nc = u->Account(); if (nc == NULL && u->IsRecognized()) { @@ -215,8 +220,6 @@ AccessGroup ChannelInfo::AccessFor(User *u) nc = na->nc; } - AccessGroup group; - group.SuperAdmin = u->SuperAdmin; group.Founder = IsFounder(u, this); group.ci = this; |