automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@71337 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge Script
2007-06-24 18:26:00 +00:00
parent 61f0a56fb9
commit 586aa67aff
2 changed files with 2 additions and 11 deletions

View File

@@ -692,11 +692,6 @@ static int action_setvar(struct mansession *s, struct message *m)
return 0;
}
if (ast_strlen_zero(varval)) {
astman_send_error(s, m, "No value specified");
return 0;
}
if (!ast_strlen_zero(name)) {
c = ast_get_channel_by_name_locked(name);
if (!c) {
@@ -705,7 +700,7 @@ static int action_setvar(struct mansession *s, struct message *m)
}
}
pbx_builtin_setvar_helper(c, varname, varval);
pbx_builtin_setvar_helper(c, varname, varval ? varval : "");
if (c)
ast_mutex_unlock(&c->lock);