Merged revisions 54924 via svnmerge from

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

........
r54924 | file | 2007-02-16 13:51:15 -0500 (Fri, 16 Feb 2007) | 2 lines

Need to check macro extension as well as macro context for directed pickup.

........


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

apps/app_dial.c

@@ -1397,7 +1397,10 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
 			ast_copy_string(tc->dialcontext, chan->macrocontext, sizeof(tc->dialcontext));
 		else
 			ast_copy_string(tc->dialcontext, chan->context, sizeof(tc->dialcontext));
-		ast_copy_string(tc->exten, chan->exten, sizeof(tc->exten));
+		if (!ast_strlen_zero(chan->macroexten))
+			ast_copy_string(tc->exten, chan->macroexten, sizeof(tc->exten));
+		else
+			ast_copy_string(tc->exten, chan->exten, sizeof(tc->exten));
 
 		res = ast_call(tc, numsubst, 0);	/* Place the call, but don't wait on the answer */