aboutsummaryrefslogtreecommitdiff
path: root/src/modules/m_spanningtree/protocolinterface.cpp
diff options
context:
space:
mode:
authorGravatar Jackmcbarn2010-09-06 13:47:36 -0400
committerGravatar Jackmcbarn2010-09-06 13:51:06 -0400
commitbed2cd84f2a3f34763cea677baf5ab7e073c41b2 (patch)
tree8cfdec30b06e3261848012a926de900a5480832d /src/modules/m_spanningtree/protocolinterface.cpp
parentChange m_passforward to use PopulateInfoMap (diff)
Update m_flatfile_channels to be more robust
Enable storage of registered channels without permanent channels, or vice versa Only set the dirty bit if a channel that is written to the database gets its mode or topic changed, rather than any channel or user Move NukeChannel to core and put announcets back in options Allow sending mode merges via the protocol interface
Diffstat (limited to 'src/modules/m_spanningtree/protocolinterface.cpp')
-rw-r--r--src/modules/m_spanningtree/protocolinterface.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/modules/m_spanningtree/protocolinterface.cpp b/src/modules/m_spanningtree/protocolinterface.cpp
index f262ac0d8..5bc26014b 100644
--- a/src/modules/m_spanningtree/protocolinterface.cpp
+++ b/src/modules/m_spanningtree/protocolinterface.cpp
@@ -97,7 +97,7 @@ void SpanningTreeProtocolInterface::SendTopic(Channel* channel, std::string &top
Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FTOPIC", params);
}
-void SpanningTreeProtocolInterface::SendMode(User* src, Extensible* dest, irc::modestacker& cmodes)
+void SpanningTreeProtocolInterface::SendMode(User* src, Extensible* dest, irc::modestacker& cmodes, bool merge)
{
irc::modestacker modes(cmodes);
parameterlist outlist;
@@ -122,6 +122,7 @@ void SpanningTreeProtocolInterface::SendMode(User* src, Extensible* dest, irc::m
while (!modes.empty())
{
outlist[2] = modes.popModeLine(FORMAT_NETWORK);
+ if(merge) outlist[2][0] = '=';
Utils->DoOneToMany(src->uuid,"FMODE",outlist);
}
}