diff options
| author |   Sébastien Helleu <flashcode@flashtux.org> | 2018-02-05 21:41:03 +0100 |
|---|---|---|
| committer | Sébastien Helleu <flashcode@flashtux.org> | 2018-02-05 21:41:03 +0100 |
| commit | f889306c5edf5eeb37a9e37e6468ec0ac549d32c (patch) | |
| tree | 8ff4f825d32214d9ebbe811b77d6e4ba42b973d6 /src/plugins/irc/irc-ctcp.c | |
| parent | core: update color and link to donation page in README (diff) | |
| download | weechat-f889306c5edf5eeb37a9e37e6468ec0ac549d32c.tar.xz weechat-f889306c5edf5eeb37a9e37e6468ec0ac549d32c.zip | |
irc: allow ${irc_server.xxx} and ${server} in server evaluated options (closes #1144)
The server option "ssl_fingerprint" is now evaluated when it is used (during
SSL connection), instead of when it is set with command /set.
Diffstat (limited to 'src/plugins/irc/irc-ctcp.c')
| -rw-r--r-- | src/plugins/irc/irc-ctcp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/irc/irc-ctcp.c b/src/plugins/irc/irc-ctcp.c index 14ca3c4aa..112e842cb 100644 --- a/src/plugins/irc/irc-ctcp.c +++ b/src/plugins/irc/irc-ctcp.c @@ -467,9 +467,9 @@ irc_ctcp_replace_variables (struct t_irc_server *server, const char *format) * $username: user name, example: * name */ - username = weechat_string_eval_expression ( - IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_USERNAME), - NULL, NULL, NULL); + username = irc_server_eval_expression ( + server, + IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_USERNAME)); if (username) { temp = weechat_string_replace (res, "$username", username); @@ -484,9 +484,9 @@ irc_ctcp_replace_variables (struct t_irc_server *server, const char *format) * $realname: real name, example: * John doe */ - realname = weechat_string_eval_expression ( - IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_REALNAME), - NULL, NULL, NULL); + realname = irc_server_eval_expression ( + server, + IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_REALNAME)); if (realname) { temp = weechat_string_replace (res, "$realname", realname); |