[asterisk-commits] lmadsen: branch 1.6.0 r227163 - in /branches/1.6.0: ./ configs/

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Tue Nov  3 09:24:30 2009
New Revision: 227163

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

........
  r227162 | lmadsen | 2009-11-03 09:19:47 -0600 (Tue, 03 Nov 2009) | 7 lines
  
  Update extensions.conf.sample file to fix incorrect extensions.
  
  (closes issue #15857)
  Reported by: pprindeville
  Patches:
        stdexten.patch#2 uploaded by pprindeville (license 347)
  Tested by: pprindeville
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/configs/extensions.conf.sample

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/configs/extensions.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/configs/extensions.conf.sample?view=diff&rev=227163&r1=227162&r2=227163
==============================================================================
--- branches/1.6.0/configs/extensions.conf.sample (original)
+++ branches/1.6.0/configs/extensions.conf.sample Tue Nov  3 09:24:30 2009
@@ -439,7 +439,7 @@
 exten => stdexten-BUSY,n,NoOp(Finish stdexten BUSY)
 exten => stdexten-BUSY,n,Return()			; If they press #, return to start
 
-exten => _stdexten[\-].,1,Goto(s-NOANSWER,1)		; Treat anything else as no answer
+exten => _stdexten-.,1,Goto(stdexten-NOANSWER,1)	; Treat anything else as no answer
 
 exten => a,1,VoicemailMain(${mbx})		; If they press *, send the user into VoicemailMain
 exten => a,n,Return()
@@ -465,7 +465,7 @@
 exten => _X.,n,Set(LOCAL(mbx)="${ext}"$["${cntx}" ? "@${cntx}" :: ""])
 exten => _X.,n,Dial(${dev},20,p)			; Ring the interface, 20 seconds maximum, call screening 
 						; option (or use P for databased call _X.creening)
-exten => _X.,n,Goto(s-${DIALSTATUS},1)		; Jump based on status (NOANSWER,BUSY,CHANUNAVAIL,CONGESTION,ANSWER)
+exten => _X.,n,Goto(stdexten-${DIALSTATUS},1)		; Jump based on status (NOANSWER,BUSY,CHANUNAVAIL,CONGESTION,ANSWER)
 
 exten => stdexten-NOANSWER,1,Voicemail(${mbx},u)	; If unavailable, send to voicemail w/ unavail announce
 exten => stdexten-NOANSWER,n,NoOp(Finish stdPrivacyexten NOANSWER)
@@ -479,7 +479,7 @@
 
 exten => stdexten-TORTURE,1,Goto(${tortcntx},s,1)	; Callee chose to send this call to a telemarketer torture script.
 
-exten => _stdexten-.,1,Goto(s-NOANSWER,1)		; Treat anything else as no answer
+exten => _stdexten-.,1,Goto(stdexten-NOANSWER,1)	; Treat anything else as no answer
 
 exten => a,1,VoicemailMain(${mbx})		; If they press *, send the user into VoicemailMain
 exten => a,n,Return