Fixed strange join behavior reported by w00t (mirc requesting MODE immediately after JOIN)

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@1116 e03df62e-2008-0410-955e-edbf42e46eb7

3 files changed, 5 insertions, 4 deletions

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index de5420ddb..a16898d53 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -1676,8 +1676,8 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri
 			}
 			userlist(user,Ptr);
 			WriteServ(user->fd,"366 %s %s :End of /NAMES list.", user->nick, Ptr->name);
-			WriteServ(user->fd,"324 %s %s +%s",user->nick, Ptr->name,chanmodes(Ptr));
-			WriteServ(user->fd,"329 %s %s %d", user->nick, Ptr->name, Ptr->created);
+			//WriteServ(user->fd,"324 %s %s +%s",user->nick, Ptr->name,chanmodes(Ptr));
+			//WriteServ(user->fd,"329 %s %s %d", user->nick, Ptr->name, Ptr->created);
 			FOREACH_MOD OnUserJoin(user,Ptr);
 			return Ptr;
 		}
diff --git a/src/mode.cpp b/src/mode.cpp
index 2258d0f57..aab5a403a 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -1384,6 +1384,7 @@ void handle_mode(char **parameters, int pcnt, userrec *user)
 		{
 			/* just /modes #channel */
 			WriteServ(user->fd,"324 %s %s +%s",user->nick, Ptr->name, chanmodes(Ptr));
+                        WriteServ(user->fd,"329 %s %s %d", user->nick, Ptr->name, Ptr->created);
 			return;
 		}
 		else
diff --git a/src/modules.cpp b/src/modules.cpp
index ef3839b56..990e23d0b 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -624,8 +624,8 @@ bool Server::PseudoToUser(userrec* alive,userrec* zombie,std::string message)
                         	}
                         	userlist(zombie,Ptr);
                         	WriteServ(zombie->fd,"366 %s %s :End of /NAMES list.", zombie->nick, Ptr->name);
-                        	WriteServ(zombie->fd,"324 %s %s +%s",zombie->nick, Ptr->name,chanmodes(Ptr));
-                        	WriteServ(zombie->fd,"329 %s %s %d", zombie->nick, Ptr->name, Ptr->created);
+                        	//WriteServ(zombie->fd,"324 %s %s +%s",zombie->nick, Ptr->name,chanmodes(Ptr));
+                        	//WriteServ(zombie->fd,"329 %s %s %d", zombie->nick, Ptr->name, Ptr->created);
 
                         }
                 }