automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@21274 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 2 insertions, 1 deletions

diff --git a/pbx.c b/pbx.c
index 9ef1c1936..183a0acda 100644
--- a/pbx.c
+++ b/pbx.c
@@ -1471,9 +1471,10 @@ static void pbx_substitute_variables_helper_full(struct ast_channel *c, struct v
 			needsub = 0;
 
 			/* Find the end of it */
-			while(brackets && *vare) {
+			while (brackets && *vare) {
 				if ((vare[0] == '$') && (vare[1] == '{')) {
 					needsub++;
+				} else if (vare[0] == '{') {
 					brackets++;
 				} else if (vare[0] == '}') {
 					brackets--;