summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/cmd_qline.cpp2
-rw-r--r--src/modules/m_filter.cpp9
2 files changed, 9 insertions, 2 deletions
diff --git a/src/cmd_qline.cpp b/src/cmd_qline.cpp
index 28b6504d6..fdb714b97 100644
--- a/src/cmd_qline.cpp
+++ b/src/cmd_qline.cpp
@@ -51,7 +51,7 @@ CmdResult cmd_qline::Handle (const char** parameters, int pcnt, userrec *user)
{
time_t c_requires_crap = ServerInstance->Duration(parameters[1]) + ServerInstance->Time();
ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Q-line for %s, expires on %s",user->nick,parameters[0],
- ServerInstance->TimeString(&c_requires_crap).c_str());
+ ServerInstance->TimeString(c_requires_crap).c_str());
}
ServerInstance->XLines->apply_lines(to_apply);
}
diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index a9ea3ba5e..03ed814bc 100644
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -47,7 +47,14 @@ class ModuleFilter : public FilterBase
{
if ((ServerInstance->MatchText(text2,index->first)) || (ServerInstance->MatchText(text,index->first)))
{
- return index->second;
+ FilterResult* fr = index->second;
+ if (index != filters.begin())
+ {
+ std::string pat = index->first;
+ filters.erase(fr);
+ filters.insert(filters.begin(), std::make_pair(pat,fr));
+ }
+ return fr;
}
}
return NULL;