diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-23 16:05:26 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-23 16:05:26 +0000 |
| commit | 4a46218a85f1b4855985f3282239917073a7bb6f (patch) | |
| tree | 2a4abcd4265aa9680edae73abc19c95f305d5778 /res | |
| parent | 8ee004b728732b782dbca2bdb5d8fd1c753e1bd9 (diff) | |
Revert last change - breaks retrieval of builtin variables
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@40901 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_agi.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/res/res_agi.c b/res/res_agi.c index 935e4f1d6..e9b275ed0 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -1161,17 +1161,18 @@ static int handle_setvariable(struct ast_channel *chan, AGI *agi, int argc, char static int handle_getvariable(struct ast_channel *chan, AGI *agi, int argc, char **argv) { - const char *ret; + char *ret; char tempstr[1024]; if (argc != 3) return RESULT_SHOWUSAGE; /* check if we want to execute an ast_custom_function */ - if (!ast_strlen_zero(argv[2]) && (argv[2][strlen(argv[2]) - 1] == ')')) + if (!ast_strlen_zero(argv[2]) && (argv[2][strlen(argv[2]) - 1] == ')')) { ret = ast_func_read(chan, argv[2], tempstr, sizeof(tempstr)); - else - ret = pbx_builtin_getvar_helper(chan, argv[2]); + } else { + pbx_retrieve_variable(chan, argv[2], &ret, tempstr, sizeof(tempstr), NULL); + } if (ret) fdprintf(agi->fd, "200 result=1 (%s)\n", ret); |