Changeset 10494

Show
Ignore:
Timestamp:
11/01/10 17:30:02 (3 years ago)
Author:
p_lindheimer
Message:

Merged revisions 10215 via svnmerge from
http://www.freepbx.org/v2/svn/freepbx/trunk

........

r10215 | GameGamer?43 | 2010-08-09 00:16:41 -0700 (Mon, 09 Aug 2010) | 1 line


re #4494 - adds asterisk 1.8 support rather than displaying a fatal error message

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/branches/2.8

    • Property svnmerge-integrated changed from /freepbx/branches/2.7:1-10414 /freepbx/trunk:1-9714,9744,9768,10150-10151 to /freepbx/branches/2.7:1-10414 /freepbx/trunk:1-9714,9744,9768,10150-10151,10215

  • freepbx/branches/2.8/install_amp

    r9668 r10494  
    895895    (preg_match('/^Asterisk SVN-(\d+(\.\d+)*)(-?(.*))$/', $verinfo, $matches))) { 
    896896  if ((version_compare($matches[1], "1.2") < 0)) { 
    897     fatal("Asterisk 1.2, 1.4, or 1.6 is required for this version of FreePBX. Detected version is: ".$matches[1]); 
    898   } 
    899   if (version_compare($matches[1], "1.7", "ge")) { 
    900     fatal("Asterisk 1.2, 1.4, or 1.6 is required for this version of FreePBX. Detected version is: ".$matches[1]); 
     897    fatal("Asterisk 1.2, 1.4, 1.6, or 1.8 is required for this version of FreePBX. Detected version is: ".$matches[1]); 
     898  } 
     899  if (version_compare($matches[1], "1.9", "ge")) { 
     900    fatal("Asterisk 1.2, 1.4, 1.6, or 1.8 is required for this version of FreePBX. Detected version is: ".$matches[1]); 
    901901  } 
    902902  out("{$matches[1]}");