Merged revisions 39935 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r39935 | russell | 2006-08-15 18:49:41 -0400 (Tue, 15 Aug 2006) | 3 lines

use pbx_builtin_getvar_helper() so that GET VARIABLE can retrieve global
variables (issue #7609)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@39936 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/res/res_agi.c b/res/res_agi.c
index d12de6e..571e252 100644 (file)
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -1166,18 +1166,17 @@ 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)
 {
-       char *ret;
+       const 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)) ? NULL : tempstr;
-       } else {
-               pbx_retrieve_variable(chan, argv[2], &ret, tempstr, sizeof(tempstr), NULL);
-       }
+       else
+               ret = pbx_builtin_getvar_helper(chan, argv[2]);
 
        if (ret)
                fdprintf(agi->fd, "200 result=1 (%s)\n", ret);