summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2009-09-05 22:48:00 +0000
committerw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2009-09-05 22:48:00 +0000
commitb49d529981f4336347c5f7c17d8ce656ad50b1e5 (patch)
treee286d955ed0b85b1971cbb2ff6cd421ab586f4e2 /src/modules
parentb6decc75f28e24522bfc4a3a74dbacce22d5cb02 (diff)
Likewise, convert OnLocalTopicChange to OnPreTopicChange and to be run for both local and remote changes, for API consistency.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11678 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/m_override.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index ae18803d3..d0ec5d8fe 100644
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -41,7 +41,7 @@ class ModuleOverride : public Module
}
OverriddenMode = OverOther = false;
OverOps = OverDeops = OverVoices = OverDevoices = OverHalfops = OverDehalfops = 0;
- Implementation eventlist[] = { I_OnRehash, I_OnAccessCheck, I_On005Numeric, I_OnUserPreJoin, I_OnUserPreKick, I_OnPostCommand, I_OnLocalTopicChange, I_OnRequest };
+ Implementation eventlist[] = { I_OnRehash, I_OnAccessCheck, I_On005Numeric, I_OnUserPreJoin, I_OnUserPreKick, I_OnPostCommand, I_OnPreTopicChange, I_OnRequest };
ServerInstance->Modules->Attach(eventlist, this, 8);
}
@@ -116,9 +116,9 @@ class ModuleOverride : public Module
}
- virtual ModResult OnLocalTopicChange(User *source, Channel *channel, const std::string &topic)
+ virtual ModResult OnPreTopicChange(User *source, Channel *channel, const std::string &topic)
{
- if (IS_OPER(source) && CanOverride(source, "TOPIC"))
+ if (IS_LOCAL(source) && IS_OPER(source) && CanOverride(source, "TOPIC"))
{
if (!channel->HasUser(source) || (channel->IsModeSet('t') && channel->GetStatus(source) < STATUS_HOP))
{