projects
/
KiwiIRC.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cb234b7
)
Channel key on connect auto-join used correctly #391
author
Darren
<darren@darrenwhitlen.com>
Sat, 28 Sep 2013 15:23:17 +0000
(16:23 +0100)
committer
Darren
<darren@darrenwhitlen.com>
Sat, 28 Sep 2013 15:23:17 +0000
(16:23 +0100)
client/assets/src/models/network.js
patch
|
blob
|
blame
|
history
diff --git
a/client/assets/src/models/network.js
b/client/assets/src/models/network.js
index 93ede55bd9314701157cf7fa89233a7b6cfac753..8a02e296d6e8c6432db0fc1e90572b7e82de6c5e 100644
(file)
--- 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)