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

1 files changed, 7 insertions, 1 deletions

diff --git a/modules/commands/ns_ajoin.cpp b/modules/commands/ns_ajoin.cpp
index 03b710356..2e64ebfe0 100644
--- a/modules/commands/ns_ajoin.cpp
+++ b/modules/commands/ns_ajoin.cpp
@@ -31,7 +31,13 @@ struct AJoinList : std::vector<std::pair<Anope::string, Anope::string> >, Extens
 		sd["nc"] << this->nc->display;
 		Anope::string channels;
 		for (unsigned i = 0; i < this->size(); ++i)
-			channels += this->at(i).first + "," + this->at(i).second;
+		{
+			channels += this->at(i).first;
+			if (!this->at(i).second.empty())
+				channels += "," + this->at(i).second;
+			if (i+1 < this->size())
+				channels += " ";
+		}
 		sd["channels"] << channels;
 
 		return sd;