[asterisk-commits] tilghman: branch 1.6.1 r240131 - in /branches/1.6.1: ./ main/pbx.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Thu Jan 14 10:56:29 2010
New Revision: 240131

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=240131
Log:
Merged revisions 240129 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r240129 | tilghman | 2010-01-14 10:52:22 -0600 (Thu, 14 Jan 2010) | 4 lines
  
  Ensure that the callerid is NULL when the parent is effectively NULL.
  This applies only to pattern-match hints, which create exact-match
  hints on the fly.
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/pbx.c

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

Modified: branches/1.6.1/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/main/pbx.c?view=diff&rev=240131&r1=240130&r2=240131
==============================================================================
--- branches/1.6.1/main/pbx.c (original)
+++ branches/1.6.1/main/pbx.c Thu Jan 14 10:56:29 2010
@@ -3446,7 +3446,7 @@
 	 */
 	if (e->exten[0] == '_') {
 		ast_add_extension(e->parent->name, 0, exten, e->priority, e->label,
-			e->cidmatch, e->app, ast_strdup(e->data), ast_free_ptr,
+			e->matchcid ? e->cidmatch : NULL, e->app, ast_strdup(e->data), ast_free_ptr,
 			e->registrar);
 		e = ast_hint_extension(NULL, context, exten);
 		if (!e || e->exten[0] == '_') {