diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-09 16:50:04 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-09 16:50:04 +0000 |
| commit | 84b8798af1c2ff2f222f2740137c6b2bc2bd7245 (patch) | |
| tree | 20307f391c54c90ba29e5ac940d3b756a1dbedea | |
| parent | fc59ada152207754b0e69e7defd80ed0ef9d21da (diff) | |
Merged revisions 162016 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r162016 | russell | 2008-12-09 10:47:39 -0600 (Tue, 09 Dec 2008) | 13 lines
Merged revisions 162014 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r162014 | russell | 2008-12-09 10:46:53 -0600 (Tue, 09 Dec 2008) | 5 lines
Allow DISA to handle extensions that start with #.
(closes issue #13330)
Reported by: jcovert
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@162018 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_disa.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/apps/app_disa.c b/apps/app_disa.c index 2ed5e15f7..51cb85c3d 100644 --- a/apps/app_disa.c +++ b/apps/app_disa.c @@ -281,8 +281,14 @@ static int disa_exec(struct ast_channel *chan, void *data) continue; } } else { - if (j == '#') { /* end of extension */ - break; + if (j == '#') { /* end of extension .. maybe */ + if (i == 0 && + (ast_matchmore_extension(chan, args.context, "#", 1, chan->cid.cid_num) || + ast_exists_extension(chan, args.context, "#", 1, chan->cid.cid_num)) ) { + /* Let the # be the part of, or the entire extension */ + } else { + break; + } } } |