summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.asciidoc1
-rw-r--r--src/plugins/irc/irc-command.c5
2 files changed, 2 insertions, 4 deletions
diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc
index 04c143a46..0f498217e 100644
--- a/ChangeLog.asciidoc
+++ b/ChangeLog.asciidoc
@@ -59,6 +59,7 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
* api: add integer return code for functions hook_{signal|hsignal}_send
* alias: change default command for alias /beep to "/print -beep"
* guile: fix module used after unload of a script
+* irc: add "#" before any channel in /join, even /join 0 (closes #20)
* irc: display output of CAP LIST in server buffer
* irc: fix colors in message with CTCP reply sent to another user
* irc: evaluate content of server options "username" and "realname"
diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c
index 2395639f0..32f228d18 100644
--- a/src/plugins/irc/irc-command.c
+++ b/src/plugins/irc/irc-command.c
@@ -2172,8 +2172,6 @@ irc_command_join_server (struct t_irc_server *server, const char *arguments,
/*
* add "#" in front of each channel if no prefix is given
- * (exception if there is only "0", which is a special join argument to
- * part all channels)
*/
if (channels)
{
@@ -2203,8 +2201,7 @@ irc_command_join_server (struct t_irc_server *server, const char *arguments,
if (i > 0)
strcat (new_args, ",");
pos_channel = new_args + strlen (new_args);
- if (((num_channels > 1) || (strcmp (channels[i], "0") != 0))
- && !irc_channel_is_channel (server, channels[i]))
+ if (!irc_channel_is_channel (server, channels[i]))
{
strcat (new_args, "#");
}