Merged revisions 150305 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
r150305 | mmichelson | 2008-10-16 18:41:16 -0500 (Thu, 16 Oct 2008) | 14 lines

Merged revisions 150304 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r150304 | mmichelson | 2008-10-16 18:40:54 -0500 (Thu, 16 Oct 2008) | 6 lines

Reverting changes from commits 150298 and 150301 since
I was mistakenly under the assumption that dialplan functions
*always* required that a channel be present. I need to go
home earlier, I think :)


........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@150306 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2008-10-16 23:41:50 +00:00
parent ddddee6976
commit 92b7447620

View File

@@ -1804,10 +1804,7 @@ static int action_getvar(struct mansession *s, const struct message *m)
}
if (varname[strlen(varname) - 1] == ')') {
if (!c) {
astman_send_error(s, m, "No such channel");
return 0;
}
ast_func_read(c, (char *) varname, workspace, sizeof(workspace));
varval = workspace;
} else {