mirror of
https://github.com/anope/anope.git
synced 2026-07-07 19:43:14 +02:00
BUILD : 1.7.21 (1422) BUGS : 927 NOTES : Fixes compiling on windows. We should define new variables above the code not in between.
git-svn-id: svn://svn.anope.org/anope/trunk@1422 31f1291d-b8d6-0310-a050-a5561fc1590b git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1137 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
parent
8ff1b1d828
commit
4c9f2c89b5
+2
-3
@@ -533,6 +533,7 @@ void do_join(const char *source, int ac, char **av)
|
||||
char *s, *t;
|
||||
struct u_chanlist *c, *nextc;
|
||||
char *channame;
|
||||
time_t ts = time(NULL);
|
||||
|
||||
if (UseTS6 && ircd->ts6) {
|
||||
user = find_byuid(source);
|
||||
@@ -580,11 +581,9 @@ void do_join(const char *source, int ac, char **av)
|
||||
* don't get to see things like channel keys. */
|
||||
/* If channel already exists, check_kick() will use correct TS.
|
||||
* Otherwise, we lose. */
|
||||
if (check_kick(user, s, time(NULL)))
|
||||
if (check_kick(user, s, ts))
|
||||
continue;
|
||||
|
||||
time_t ts = time(NULL);
|
||||
|
||||
if (ac == 2) {
|
||||
if (debug) {
|
||||
alog("debug: recieved a new TS for JOIN: %ld",
|
||||
|
||||
+6
-1
@@ -9,10 +9,15 @@ VERSION_MAJOR="1"
|
||||
VERSION_MINOR="7"
|
||||
VERSION_PATCH="21"
|
||||
VERSION_EXTRA="-svn"
|
||||
VERSION_BUILD="1421"
|
||||
VERSION_BUILD="1422"
|
||||
|
||||
# $Log$
|
||||
#
|
||||
# BUILD : 1.7.21 (1422)
|
||||
# BUGS : 927
|
||||
# NOTES : Fixes compiling on windows. We should define new variables
|
||||
# above the code not in between.
|
||||
#
|
||||
#
|
||||
# BUILD : 1.7.21 (1421)
|
||||
# BUGS : 879
|
||||
|
||||
Reference in New Issue
Block a user