Changeset 10357

Show
Ignore:
Timestamp:
10/05/10 12:35:30 (3 years ago)
Author:
p_lindheimer
Message:

Merged revisions 10355 via svnmerge from
http://svn.freepbx.org/modules/branches/2.7

........

r10355 | p_lindheimer | 2010-10-05 09:21:23 -0700 (Tue, 05 Oct 2010) | 1 line


fixes #4574 fix CFB

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.8

    • Property svnmerge-integrated changed from /modules/branches/2.7:1-9074,9105,10001,10196,10253,10264,10295 /modules/branches/2.9:1-10122 to /modules/branches/2.7:1-9074,9105,10001,10196,10253,10264,10295,10355 /modules/branches/2.9:1-10122

  • modules/branches/2.8/core/functions.inc.php

    r10346 r10357  
    29182918      $exten = 'docfb'; 
    29192919      $ext->add($mcontext,$exten,'docfb', new ext_set("RTCFB", '${IF($["${VMBOX}"!="novm"]?${RINGTIMER}:"")}')); 
    2920       $ext->add($mcontext,$exten,'', new ext_dial('Local/${CFUEXT}@from-internal/n', '${RTCFB},${DIAL_OPTIONS}')); 
     2920      $ext->add($mcontext,$exten,'', new ext_dial('Local/${CFBEXT}@from-internal/n', '${RTCFB},${DIAL_OPTIONS}')); 
    29212921      $ext->add($mcontext,$exten,'', new ext_return('')); 
    29222922 

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

    r10275 r10357  
    44  <category>Basic</category> 
    55  <name>Core</name> 
    6   <version>2.8.0.3</version> 
     6  <version>2.8.0.4</version> 
    77  <publisher>FreePBX</publisher> 
    88  <license>GPLv2+</license> 
    …… 
    1010  <canuninstall>no</canuninstall> 
    1111  <changelog> 
     12    *2.8.0.4* #4574 
    1213    *2.8.0.3* #4401, #4525, #4507, #4499 
    1314    *2.8.0.2* #4443, #4444, #4460, #4414