[asterisk-commits] trunk r15659 - in /trunk: ./ pbx/pbx_ael.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Tue Mar 28 12:13:53 2006
New Revision: 15659

URL: http://svn.digium.com/view/asterisk?rev=15659&view=rev
Log:
Merged revisions 15658 via svnmerge from 
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)

........

Modified:
    trunk/   (props changed)
    trunk/pbx/pbx_ael.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/pbx/pbx_ael.c
URL: http://svn.digium.com/view/asterisk/trunk/pbx/pbx_ael.c?rev=15659&r1=15658&r2=15659&view=diff
==============================================================================
--- trunk/pbx/pbx_ael.c (original)
+++ trunk/pbx/pbx_ael.c Tue Mar 28 12:13:53 2006
@@ -778,8 +778,8 @@
 				*label = NULL;
 				/* Remember where the whileblock starts */
 				forblock = (*pos);
+				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);
-				build_step("for", margs, filename, lineno, con, exten, pos, c, &fillin, label);
 				/* Close the loop */
 				app = "Goto";
 				snprintf(margs, mlen, "%d", forstart);