From: Darren <darren@darrenwhitlen.com>
Date: Sat, 28 Sep 2013 15:23:17 +0000 (+0100)
Subject: Channel key on connect auto-join used correctly #391
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=852c230cb2df65800b7014667570a85639da0fc7;p=KiwiIRC.git

Channel key on connect auto-join used correctly #391
---

diff --git a/client/assets/src/models/network.js b/client/assets/src/models/network.js
index 93ede55..8a02e29 100644
--- a/client/assets/src/models/network.js
+++ b/client/assets/src/models/network.js
@@ -220,7 +220,7 @@
 
         // Auto joining channels
         if (this.auto_join && this.auto_join.channel) {
-            panels = this.createAndJoinChannels(this.auto_join.channel + ' ' + (this.auto_join.channel_key || ''));
+            panels = this.createAndJoinChannels(this.auto_join.channel + ' ' + (this.auto_join.key || ''));
 
             // Show the last channel if we have one
             if (panels)