[asterisk-commits] seanbright: branch 1.6.1 r198295 - in /branches/1.6.1: ./ apps/app_dial.c

[SVN commits to the Asterisk project]

Author: seanbright
Date: Fri May 29 22:28:05 2009
New Revision: 198295

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=198295
Log:
Merged revisions 198285 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r198285 | seanbright | 2009-05-29 23:26:06 -0400 (Fri, 29 May 2009) | 15 lines
  
  Merged revisions 198251 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r198251 | seanbright | 2009-05-29 22:46:41 -0400 (Fri, 29 May 2009) | 8 lines
    
    Treat an empty FORWARD_CONTEXT the same way we treat a missing one.
    
    (closes issue #15056)
    Reported by: p_lindheimer
    Patches:
          05292009_bug15056.diff uploaded by seanbright (license 71)
    Tested by: p_lindheimer
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_dial.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/apps/app_dial.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/apps/app_dial.c?view=diff&rev=198295&r1=198294&r2=198295
==============================================================================
--- branches/1.6.1/apps/app_dial.c (original)
+++ branches/1.6.1/apps/app_dial.c Fri May 29 22:28:05 2009
@@ -507,6 +507,9 @@
 		const char *forward_context;
 		ast_channel_lock(c);
 		forward_context = pbx_builtin_getvar_helper(c, "FORWARD_CONTEXT");
+		if (ast_strlen_zero(forward_context)) {
+			forward_context = NULL;
+		}
 		snprintf(tmpchan, sizeof(tmpchan), "%s@%s", c->call_forward, forward_context ? forward_context : c->context);
 		ast_channel_unlock(c);
 		stuff = tmpchan;