diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-14 17:39:02 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-14 17:39:02 +0000 |
| commit | ce7fa254e56b3bb62561f2132f42de0f381ce247 (patch) | |
| tree | a51c5ae287c4c43b91b33059e354438ebf29a3e6 | |
| parent | c6f578190d925fc0d1b901b8fa431cd428fba82a (diff) | |
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.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@240176 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/pbx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/pbx.c b/main/pbx.c index fac0cdafc..c4c130249 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -5763,7 +5763,7 @@ static void context_merge(struct ast_context **extcontexts, struct ast_hashtab * 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); |