Navigation

Changeset 6209

Timestamp:

07/26/08 22:13:28 (1 month ago)

Author:

p_lindheimer

Message:

Merged revisions 6208 via svnmerge from and ref #2956
http://svn.freepbx.org/modules/branches/2.5

........

r6208 | p_lindheimer | 2008-07-26 22:11:04 -0700 (Sat, 26 Jul 2008) | 1 line

closes #2956 no more channel to be spliced

........

Files:

modules/branches/2.4
- Property svnmerge-integrated changed from /modules/branches/2.3:1-5233,5245,5333,5336 /modules/branches/2.5:1-5852,5880,5930,5995,6016-6017,6030-6031,6142 to /modules/branches/2.3:1-5233,5245,5333,5336 /modules/branches/2.5:1-5852,5880,5930,5995,6016-6017,6030-6031,6142,6208

r5388	r6209
140	140	if (is_array($didlist)) {
141	141	foreach ($didlist as $item) {
142		$did = core_did_get($item['extension'],$item['cidnum']~~,$item['channel']~~);
	142	$did = core_did_get($item['extension'],$item['cidnum']);
143	143	$exten = $item['extension'];
144	144	$cidnum = $item['cidnum'];
145		~~$channel = $item['channel'];~~
146	145
147	146	$exten = (empty($exten)?"s":$exten);
148	147	$exten = $exten.(empty($cidnum)?"":"/".$cidnum); //if a CID num is defined, add it
149	148
150		if (empty($channel))
151		$context = "ext-did";
152		else
153		$context = "macro-from-zaptel-{$channel}";
154
	149	$context = "ext-did";
155	150	$ext->splice($context, $exten, 1, new ext_gosub('1', 's', 'app-blacklist-check'));
156	151	}