summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changes1
-rw-r--r--src/chanserv.c14
-rw-r--r--version.log6
3 files changed, 18 insertions, 3 deletions
diff --git a/Changes b/Changes
index d0da25535..5099ebb80 100644
--- a/Changes
+++ b/Changes
@@ -16,6 +16,7 @@ Provided by Anope Dev. <dev@anope.org> - 2004
11/19 A Added anope_cmd_ctcp() to code API, for sending CTCP messages. [ #00]
11/18 A Unable to use registered nicknames as bot nicks from now on. [ #00]
11/18 A NSAddAccessOnReg to control access list on registration. [ #00]
+01/05 F Not resetting the topic on channel creation with KEEPTOPIC off. [#267]
01/04 F Fixed up some alog() messages that were incorrect. [#266]
01/01 F Ultimate3 channel modes, which had been defined incorrectly. [ #00]
12/31 F Fixed integer overflow error with CS ACCESS/LEVELS. [#262]
diff --git a/src/chanserv.c b/src/chanserv.c
index fe12ee9db..073cb2f2a 100644
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -1747,11 +1747,21 @@ void restore_topic(char *chan)
Channel *c = findchan(chan);
ChannelInfo *ci;
- if (!c || !(ci = c->ci) || !(ci->flags & CI_KEEPTOPIC))
+ if (!c || !(ci = c->ci))
return;
+ if (!(ci->flags & CI_KEEPTOPIC)) {
+ /* We need to reset the topic here, since it's currently empty and
+ * should be updated with a TOPIC from the IRCd soon. -GD
+ */
+ ci->last_topic = NULL;
+ strscpy(ci->last_topic_setter, whosends(ci), NICKMAX);
+ ci->last_topic_time = time(NULL);
+ /* And we still return... -GD */
+ return;
+ }
if (c->topic)
free(c->topic);
- if ((ci->last_topic) && !(ci->flags & CI_TOPICLOCK)) {
+ if (ci->last_topic) {
c->topic = sstrdup(ci->last_topic);
strscpy(c->topic_setter, ci->last_topic_setter, NICKMAX);
c->topic_time = ci->last_topic_time;
diff --git a/version.log b/version.log
index 31ba62a15..cdde205e2 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,14 @@
VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="6"
-VERSION_BUILD="522"
+VERSION_BUILD="523"
# $Log$
#
+# BUILD : 1.7.6 (523)
+# BUGS : 267
+# NOTES : Internal last topic was not emptied on channel creation when KEEPTOPIC was off
+#
# BUILD : 1.7.6 (522)
# BUGS : 254
# NOTES : Memo INFO should finallly be fixed