summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam <Adam@anope.org>2013-08-16 14:51:58 -0400
committerAdam <Adam@anope.org>2013-08-16 14:51:58 -0400
commitd24ae1f961a70e8f3edff8816eaaff7cf5705e5b (patch)
treeae16b6b9a19f7b707b5edf291c449b61decac7a0
parenteab5abb351dd3372953bd9059e2b56fde245bf05 (diff)
Fix kick reason in cs_suspend and cs_forbid if no reason is given
-rw-r--r--Changes1
-rw-r--r--src/core/cs_forbid.c2
-rw-r--r--src/core/cs_suspend.c2
-rw-r--r--version.log3
4 files changed, 5 insertions, 3 deletions
diff --git a/Changes b/Changes
index c8af2c1ee..259c1d9a1 100644
--- a/Changes
+++ b/Changes
@@ -2,6 +2,7 @@ Anope Version 1.8 - GIT
-------------------
06/05 F Fixed modules being loaded regardless of the load abort signal. [#1527]
08/16 F Fixed hs_request to show requested ident in memos [#1545]
+08/16 F Fix kick reason in cs_suspend/cs_forbid if no reason is given [#1544]
Provided by Michael Wobst - 2013
05/25 U Update Hybrid protocol module to support Hybrid 8.1
diff --git a/src/core/cs_forbid.c b/src/core/cs_forbid.c
index 678c65d71..860cb2073 100644
--- a/src/core/cs_forbid.c
+++ b/src/core/cs_forbid.c
@@ -137,7 +137,7 @@ static int do_forbid(User * u)
av[0] = c->name;
av[1] = cu->user->nick;
- av[2] = reason ? reason : "CHAN_FORBID_REASON";
+ av[2] = reason ? reason : getstring(cu->user->na, CHAN_FORBID_REASON);
anope_cmd_kick(s_ChanServ, av[0], av[1], av[2]);
do_kick(s_ChanServ, 3, av);
}
diff --git a/src/core/cs_suspend.c b/src/core/cs_suspend.c
index bc4ac0c72..f45c5dbc2 100644
--- a/src/core/cs_suspend.c
+++ b/src/core/cs_suspend.c
@@ -127,7 +127,7 @@ static int do_suspend(User * u)
av[0] = c->name;
av[1] = cu->user->nick;
- av[2] = reason ? reason : "CHAN_SUSPEND_REASON";
+ av[2] = reason ? reason : getstring(cu->user->na, CHAN_SUSPEND_REASON);
anope_cmd_kick(s_ChanServ, av[0], av[1], av[2]);
do_kick(s_ChanServ, 3, av);
}
diff --git a/version.log b/version.log
index 54ac6e38e..fe199955a 100644
--- a/version.log
+++ b/version.log
@@ -8,9 +8,10 @@ VERSION_MAJOR="1"
VERSION_MINOR="8"
VERSION_PATCH="9"
VERSION_EXTRA="-git"
-VERSION_BUILD="3124"
+VERSION_BUILD="3125"
# Changes since 1.8.8 Release
+#Revision 3125 - Fix kick reason in cs_suspend and cs_forbid if no reason is given
#Revision 3124 - hs_request: Improve logging of new vhost requests
#Revision 3120 - Fix many memory leaks and valgrind warnings, see pull request #15
#Revision 3119 - Fix not deleting the old server entry when juping existing servers on Unreal