From b98acac5c91ecb08da28d70185818a19991eb1db Mon Sep 17 00:00:00 2001
From: attilamolnar
Date: Fri, 12 Apr 2013 16:00:17 +0200
Subject: Channel::JoinUser() and Channel::ForceChan() changes

Convert static Channel::ForceChan() to non-static Channel::ForceJoin() that joins a user to a channel, no permission checks

The (static) Channel::JoinUser() now has a LocalUser parameter, and no longer have TS and bursting parameters. If the channel doesn't exist, it is created using current time as TS
---
 src/modules/m_spanningtree/fjoin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/modules/m_spanningtree/fjoin.cpp')

diff --git a/src/modules/m_spanningtree/fjoin.cpp b/src/modules/m_spanningtree/fjoin.cpp
index be13f5318..5e58a164f 100644
--- a/src/modules/m_spanningtree/fjoin.cpp
+++ b/src/modules/m_spanningtree/fjoin.cpp
@@ -192,7 +192,7 @@ bool CommandFJoin::ProcessModeUUIDPair(const std::string& item, TreeSocket* src_
 		}
 	}
 
-	Channel::JoinUser(who, chan->name, true, "", route_back_again->bursting, chan->age);
+	chan->ForceJoin(who, NULL, route_back_again->bursting);
 	return true;
 }
 
-- 
cgit v1.3.1-10-gc9f91