diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-31 11:40:26 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-31 11:40:26 +0100 |
| commit | 65e12d5d0af48a850536fc8940e360f0baa2fe27 (patch) | |
| tree | 33728f80319ec512aba54abf54442c05e3bd24c6 | |
| parent | 52f7cff0795a42da30f18033bde3633f985539b0 (diff) | |
| parent | 09c5d6929a20bda3972c80ee62e9f4ad2f25e9cf (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
| -rw-r--r-- | misc/freeswitch/scripts/dialplan/dialplan.lua | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/misc/freeswitch/scripts/dialplan/dialplan.lua b/misc/freeswitch/scripts/dialplan/dialplan.lua index 6e9bf68..55f714b 100644 --- a/misc/freeswitch/scripts/dialplan/dialplan.lua +++ b/misc/freeswitch/scripts/dialplan/dialplan.lua @@ -445,6 +445,8 @@ function Dialplan.dial(self, destination) send_ringing = ( self.send_ringing_to_gateways and self.caller.from_gateway ), bypass_media_network = self.config.parameters.bypass_media_network, update_callee_display = self.config.parameters.update_callee_display, + detect_dtmf_after_bridge_caller = self.detect_dtmf_after_bridge_caller, + detect_dtmf_after_bridge_callee = self.detect_dtmf_after_bridge_callee, } ); end @@ -759,7 +761,7 @@ function Dialplan.switch(self, destination) elseif not common.str.blank(destination.number) then local result = { continue = false, code = 404, phrase = 'No route' } - local clip_no_screening = common.str.try(caller, 'account.record.clip_no_screening'); + local clip_no_screening = common.str.try(self.caller, 'account.record.clip_no_screening'); self.caller.caller_id_numbers = {} if not common.str.blank(clip_no_screening) then for index, number in ipairs(common.str.strip_to_a(clip_no_screening, ',')) do |