Changeset 10040

Show
Ignore:
Timestamp:
07/07/10 16:54:28 (2 years ago)
Author:
p_lindheimer
Message:

Merged revisions 10019 via svnmerge from
http://www.freepbx.org/v2/svn/freepbx/branches/2.7

........

r10019 | p_lindheimer | 2010-07-01 07:12:54 -0700 (Thu, 01 Jul 2010) | 1 line


fixes #4185 use DAHDI channels when compatibility mode is used

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/branches/2.8

    • Property svnmerge-integrated changed from /freepbx/branches/2.7:1-9372,9634-9729,9731-9795,9798-9811 /freepbx/trunk:1-9714,9744,9768 to /freepbx/branches/2.7:1-9372,9634-9729,9731-9795,9798-9811,10019 /freepbx/trunk:1-9714,9744,9768

  • freepbx/branches/2.8/amp_conf/bin/retrieve_op_conf_from_mysql.php

    r8599 r10040  
    192192            } 
    193193            if (!($inzaplines)) { 
     194               if ($chan_dahdi) { 
     195              array_push($zaplines,array( "DAHDI/$i","$newlabel" )); 
     196               } else { 
    194197              array_push($zaplines,array( "Zap/$i","$newlabel" )); 
     198               } 
    195199            } 
    196200          } //istrunk