Set the creator of default mlocks to the channel founder when a channel is registered

2 files changed, 6 insertions, 3 deletions

diff --git a/include/regchannel.h b/include/regchannel.h
index 855c3891d..804412cc5 100644
--- a/include/regchannel.h
+++ b/include/regchannel.h
@@ -101,15 +101,15 @@ struct ModeLock
 class CoreExport ChannelInfo : public Extensible, public Flags<ChannelInfoFlag, CI_END>
 {
  private:
-	typedef std::multimap<ChannelModeName, ModeLock> ModeList;
-
 	NickCore *founder;							/* Channel founder */
 	std::vector<ChanAccess *> access;                                       /* List of authorized users */
 	std::vector<AutoKick *> akick;						/* List of users to kickban */
 	std::vector<BadWord *> badwords;					/* List of badwords */
-	ModeList mode_locks;
 
  public:
+	typedef std::multimap<ChannelModeName, ModeLock> ModeList;
+	ModeList mode_locks;
+
  	/** Default constructor
 	 * @param chname The channel name
 	 */
diff --git a/modules/commands/cs_register.cpp b/modules/commands/cs_register.cpp
index 01aa5f18d..632cbced7 100644
--- a/modules/commands/cs_register.cpp
+++ b/modules/commands/cs_register.cpp
@@ -54,6 +54,9 @@ class CommandCSRegister : public Command
 			if (!chdesc.empty())
 				ci->desc = chdesc;
 
+			for (ChannelInfo::ModeList::iterator it = ci->mode_locks.begin(), it_end = ci->mode_locks.end(); it != it_end; ++it)
+				it->second.setter = u->nick;
+
 			if (c && !c->topic.empty())
 			{
 				ci->last_topic = c->topic;