Changeset 5115

Show
Ignore:
Timestamp:
10/10/07 01:18:35 (6 years ago)
Author:
p_lindheimer
Message:

Merged revisions 5111 via svnmerge from
http://svn.freepbx.org/modules/branches/2.3

........

r5111 | p_lindheimer | 2007-10-09 22:08:54 -0700 (Tue, 09 Oct 2007) | 1 line


#2408: fix syntax error when max channels not specified

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.4

    • Property svnmerge-integrated changed from /modules/branches/2.3:1-5080 to /modules/branches/2.3:1-5080,5111

  • modules/branches/2.4/core/etc/extensions.conf

    r5114 r5115  
    758758exten => s,n,Macro(outbound-callerid,${ARG1}) 
    759759exten => s,n,Set(GROUP()=OUT_${ARG1}) 
     760exten => s,n,GotoIf($["${OUTMAXCHANS_${ARG1}}foo" = "foo"]?nomax) 
    760761exten => s,n,GotoIf($[ ${GROUP_COUNT()} > ${OUTMAXCHANS_${ARG1}} ]?nochans) 
    761 exten => s,n,Set(DIAL_NUMBER=${ARG2}) 
     762exten => s,n(nomax),Set(DIAL_NUMBER=${ARG2}) 
    762763exten => s,n,Set(DIAL_TRUNK=${ARG1}) 
    763764exten => s,n,AGI(fixlocalprefix)  ; this sets DIAL_NUMBER to the proper dial string for this trunk 

  • modules/branches/2.4/core/module.xml

    r5114 r5115  
    88  <canuninstall>no</canuninstall> 
    99  <changelog> 
    10     *2.3.0.4* #2372 require trunk Outbound CallerID when Never Overid CallerID checked, #2384 no CDR for bad-numbers 
    1110    *2.3.0.3* #2308 FROM_DID to use ${EXTEN}, #2381 add iax_general_custom.conf, #2375 localization fixes 
    1211    *2.3.0.2* #2330 allow '_' in route name changes, fix missing global variable.