summaryrefslogtreecommitdiff
path: root/src/memoserv.cpp
diff options
context:
space:
mode:
authorDukePyrolator <DukePyrolator@anope.org>2010-12-24 06:42:55 +0100
committerDukePyrolator <DukePyrolator@anope.org>2010-12-24 06:42:55 +0100
commit4235df2b28a26cb166a250d016f1fd9b417cb94b (patch)
tree71e7d99d4cf1c3f679593ff982baa37689f7b3e7 /src/memoserv.cpp
parenta0ad3c4fef7e35c68dee128950ef95c0c56849fe (diff)
parent1a3ba00c246803ee06a680060454fb6782e5dd7d (diff)
Merge branch '1.9' of ssh://anope.git.sourceforge.net/gitroot/anope/anope into 1.9
Diffstat (limited to 'src/memoserv.cpp')
-rw-r--r--src/memoserv.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/memoserv.cpp b/src/memoserv.cpp
index ef6a9a5f8..13543011a 100644
--- a/src/memoserv.cpp
+++ b/src/memoserv.cpp
@@ -239,7 +239,7 @@ void memo_send(CommandSource &source, const Anope::string &name, const Anope::st
if (Config->MSNotifyAll)
{
- if (nc->HasFlag(NI_MEMO_RECEIVE) && !get_ignore(name))
+ if (nc->HasFlag(NI_MEMO_RECEIVE))
{
for (std::list<NickAlias *>::iterator it = nc->aliases.begin(), it_end = nc->aliases.end(); it != it_end; ++it)
{
@@ -274,7 +274,7 @@ void memo_send(CommandSource &source, const Anope::string &name, const Anope::st
if (check_access(cu->user, c->ci, CA_MEMO))
{
- if (cu->user->Account() && cu->user->Account()->HasFlag(NI_MEMO_RECEIVE) && !get_ignore(cu->user->nick))
+ if (cu->user->Account() && cu->user->Account()->HasFlag(NI_MEMO_RECEIVE))
cu->user->SendMessage(MemoServ, MEMO_NEW_X_MEMO_ARRIVED, c->ci->name.c_str(), Config->s_MemoServ.c_str(), c->ci->name.c_str(), mi->memos.size());
}
}