Added ignore_csuspend to *ChanServ.csuspend and *ChanServ.cunsuspend as a default...

diff --git a/ChangeLog b/ChangeLog
index 177155ad6e9cf28f0a58acc24e3e7c4b6f28f960..177c0a543c68d3c0c96bcf74d6e00e4105db8392 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 /***********************************************************************
 X3 ChangeLog
 
+2010-09-19  Matthew Beeching  <jobe@mdbnet.co.uk>
+
+       * src/chanserv.c: Added ignore_csuspend to *ChanServ.csuspend
+       and *ChanServ.cunsuspend as a default flag.
+
 2010-09-17  Matthew Beeching  <jobe@mdbnet.co.uk>
 
        * src/chanserv.c: Updated ChanServ.staff, ChanServ.ircops and

diff --git a/src/chanserv.c b/src/chanserv.c
index cf90917576eb71fcc80b002ada075a855ef192f6..63b95733c145a0ca6899507232c029c5f74aee3b 100644 (file)
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -9984,8 +9984,8 @@ init_chanserv(const char *nick)
     modcmd_register(chanserv_module, "dnrsearch remove", NULL, 0, 0, NULL);
     modcmd_register(chanserv_module, "dnrsearch count", NULL, 0, 0, NULL);
     DEFINE_COMMAND(move, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_REGCHAN, "template", "register", NULL);
-    DEFINE_COMMAND(csuspend, 2, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_REGCHAN, "flags", "+helping", NULL);
-    DEFINE_COMMAND(cunsuspend, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_REGCHAN, "flags", "+helping", NULL);
+    DEFINE_COMMAND(csuspend, 2, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_REGCHAN|MODCMD_IGNORE_CSUSPEND, "flags", "+helping", NULL);
+    DEFINE_COMMAND(cunsuspend, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_REGCHAN|MODCMD_IGNORE_CSUSPEND, "flags", "+helping", NULL);
     DEFINE_COMMAND(createnote, 5, 0, "level", "800", NULL);
     DEFINE_COMMAND(removenote, 2, 0, "level", "800", NULL);