Merge branch '1.9' of anope.git.sf.net:/gitroot/anope/anope into 1.9

modules/extra/m_chanstats.cpp

@@ -63,6 +63,9 @@ class MChanstats : public Module
 	void GetTables()
 	{
 		TableList.clear();
+		if (!sql)
+			return;
+
 		SQLResult r = this->sql->RunQuery(this->sql->GetTables());
 		for (int i = 0; i < r.Rows(); ++i)
 		{
@@ -160,8 +163,10 @@ class MChanstats : public Module
 
 		Anope::string engine = config.ReadValue("chanstats", "engine", "", 0);
 		this->sql = service_reference<SQLProvider>("SQLProvider", engine);
-		this->CheckTables();
-
+		if (sql)
+			this->CheckTables();
+		else
+			Log() << "Chanstats: no database connection to " << engine;
 	}
 	void OnTopicUpdated(Channel *c, User *u, const Anope::string &topic) anope_override
 	{

src/channels.cpp

@@ -537,7 +537,7 @@ void Channel::SetMode(const BotInfo *bi, ChannelMode *cm, const Anope::string &p
 	}
 
 	ModeManager::StackerAdd(bi, this, cm, true, param);
-	SetModeInternal(bi ? finduser(bi->nick) : NULL, cm, param, EnforceMLock);
+	SetModeInternal(bi, cm, param, EnforceMLock);
 }
 
 /**
@@ -589,7 +589,7 @@ void Channel::RemoveMode(const BotInfo *bi, ChannelMode *cm, const Anope::string
 	}
 
 	ModeManager::StackerAdd(bi, this, cm, false, realparam);
-	RemoveModeInternal(bi ? finduser(bi->nick) : NULL, cm, realparam, EnforceMLock);
+	RemoveModeInternal(bi, cm, realparam, EnforceMLock);
 }
 
 /**

src/servers.cpp

@@ -70,7 +70,7 @@ Server::Server(Server *uplink, const Anope::string &name, unsigned hops, const A
 							if (cm == NULL)
 								cm = ModeManager::FindChannelModeByChar(ModeManager::GetStatusChar(want_modes[j]));
 							if (cm && cm->Type == MODE_STATUS)
-								c->SetModeInternal(bi ? finduser(bi->nick) : NULL, cm, bi->nick);
+								c->SetModeInternal(bi, cm, bi->nick);
 						}
 					}
 				}