Revert "pbx_ael: Global variables are not expanded."

This reverts commit f67258d17283f245b0d8a34c2288ca290fe679bf.

Reason for revert: Behavior change that breaks existing dialplan.

ASTERISK-30472 #close

Change-Id: Ia03fa7f049f964ed396f6bf6d7ca096b665aa6b3

diff --git a/res/ael/pval.c b/res/ael/pval.c
index 8596d66373e458b259343a5e6e5d24944d169c94..10af1597e82d8d51b48d216a70c3830ae40b4413 100644 (file)
--- a/res/ael/pval.c
+++ b/res/ael/pval.c
@@ -4414,11 +4414,7 @@ int ast_compile_ael2(struct ast_context **local_contexts, struct ast_hashtab *lo
 {
        pval *p,*p2;
        struct ast_context *context;
-#ifdef LOW_MEMORY
        char buf[2000];
-#else
-       char buf[8192];
-#endif
        struct ael_extension *exten;
        struct ael_extension *exten_list = 0;
 
@@ -4431,13 +4427,9 @@ int ast_compile_ael2(struct ast_context **local_contexts, struct ast_hashtab *lo
                case PV_GLOBALS:
                        /* just VARDEC elements */
                        for (p2=p->u1.list; p2; p2=p2->next) {
-#ifdef STANDALONE
-                               snprintf(buf, sizeof(buf), "%s=%s", p2->u1.str, p2->u2.val);
-                               pbx_builtin_setvar(NULL, buf);
-#else
-                               pbx_substitute_variables_helper(NULL, p2->u2.val, buf, sizeof(buf) - 1);
-                               pbx_builtin_setvar_helper(NULL, p2->u1.str, buf);
-#endif
+                               char buf2[2000];
+                               snprintf(buf2,sizeof(buf2),"%s=%s", p2->u1.str, p2->u2.val);
+                               pbx_builtin_setvar(NULL, buf2);
                        }
                        break;
                default: