[svn-commits] tilghman: branch 1.6.1 r240177 - in /branches/1.6.1: ./ main/pbx.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu Jan 14 11:39:37 2010
New Revision: 240177

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

........
  r240175 | tilghman | 2010-01-14 11:34:53 -0600 (Thu, 14 Jan 2010) | 2 lines
  
  Similarly, ensure that matchcid is duplicated correctly when merging contexts.
........

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=240177&r1=240176&r2=240177
==============================================================================
--- branches/1.6.1/main/pbx.c (original)
+++ branches/1.6.1/main/pbx.c Thu Jan 14 11:39:37 2010
@@ -6040,7 +6040,7 @@
 				dupdstr = ast_strdup(prio_item->data);
 				
 				res1 = ast_add_extension2(new, 0, prio_item->exten, prio_item->priority, prio_item->label, 
-										  prio_item->cidmatch, prio_item->app, dupdstr, prio_item->datad, prio_item->registrar);
+										  prio_item->matchcid ? prio_item->cidmatch : NULL, prio_item->app, dupdstr, prio_item->datad, prio_item->registrar);
 				if (!res1 && new_exten_item && new_prio_item){
 					ast_verb(3,"Dropping old dialplan item %s/%s/%d [%s(%s)] (registrar=%s) due to conflict with new dialplan\n",
 							context->name, prio_item->exten, prio_item->priority, prio_item->app, (char*)prio_item->data, prio_item->registrar);