Merged revisions 15658 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Tue, 28 Mar 2006 18:13:53 +0000 (18:13 +0000)
committerRussell Bryant <russell@russellbryant.com>
Tue, 28 Mar 2006 18:13:53 +0000 (18:13 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r15658 | russell | 2006-03-28 13:09:05 -0500 (Tue, 28 Mar 2006) | 2 lines

fix the order in which for loops are expanded (issue #6810)

........

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

pbx/pbx_ael.c

index 4b758a6..0ab5886 100644 (file)
@@ -778,8 +778,8 @@ static int __build_step(const char *what, const char *name, const char *filename
                                *label = NULL;
                                /* Remember where the whileblock starts */
                                forblock = (*pos);
-                               build_step("for", margs, filename, lineno, con, exten, pos, fields->next->next->data, &fillin, label);
                                build_step("for", margs, filename, lineno, con, exten, pos, c, &fillin, label);
+                               build_step("for", margs, filename, lineno, con, exten, pos, fields->next->next->data, &fillin, label);
                                /* Close the loop */
                                app = "Goto";
                                snprintf(margs, mlen, "%d", forstart);