[asterisk-commits] trunk r10302 - in /trunk: ./ apps/app_voicemail.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Thu Feb 16 12:19:05 2006
New Revision: 10302

URL: http://svn.digium.com/view/asterisk?rev=10302&view=rev
Log:
Merged revisions 10301 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r10301 | russell | 2006-02-16 13:07:52 -0500 (Thu, 16 Feb 2006) | 3 lines

when executing the Directory application from voicemail and a context is not
specified, use the "default" context, not the channel's current context (issue #6507)

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_voicemail.c

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

Modified: trunk/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_voicemail.c?rev=10302&r1=10301&r2=10302&view=diff
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Thu Feb 16 12:19:05 2006
@@ -3403,7 +3403,7 @@
 				break;
 		}
 		
-		if( use_directory ) {
+		if (use_directory) {
 			/* use app_directory */
 			
 			char old_context[sizeof(chan->context)];
@@ -3420,7 +3420,7 @@
 				old_priority = chan->priority;
 				
 				/* call the the Directory, changes the channel */
-				res = pbx_exec(chan, app, ((context)?context:chan->context), 1);
+				res = pbx_exec(chan, app, context ? context : "default", 1);
 				
 				ast_copy_string(username, chan->exten, sizeof(username));