Changeset 6985 for modules

Show
Ignore:
Timestamp:
10/15/08 09:13:53 (5 years ago)
Author:
p_lindheimer
Message:

Merged revisions 6984 via svnmerge from
http://svn.freepbx.org/modules/branches/2.5

........

r6984 | p_lindheimer | 2008-10-15 06:10:39 -0700 (Wed, 15 Oct 2008) | 1 line


fixes #3281 syntax error missing }

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • 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,6218,6291,6361,6363,6413-6414,6422,6428-6430,6442-6443,6557,6710,6714-6715,6969-6970 to /modules/branches/2.3:1-5233,5245,5333,5336 /modules/branches/2.5:1-5852,5880,5930,5995,6016-6017,6030-6031,6142,6218,6291,6361,6363,6413-6414,6422,6428-6430,6442-6443,6557,6710,6714-6715,6969-6970,6984

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

    r6292 r6985  
    447447exten => o,n(doopdef),GotoIf($["x${OPERATOR_XTN}"="x"]?nooper:from-internal,${OPERATOR_XTN},1) 
    448448exten => o,n(nooper),GotoIf($["x${FROM_DID}"="x"]?nodid) 
    449 exten => o,n,Dial(Local/${FROM_DID)@from-pstn) 
     449exten => o,n,Dial(Local/${FROM_DID}@from-pstn) 
    450450exten => o,n,Macro(hangup) 
    451451exten => o,n(nodid),Dial(Local/s@from-pstn)