Changeset 6145
- Timestamp:
- 07/23/08 12:34:07 (3 months ago)
- Files:
-
- freepbx/branches/2.4 (modified) (1 prop)
- freepbx/branches/2.4/amp_conf/bin/retrieve_conf (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
freepbx/branches/2.4
- Property svnmerge-integrated changed from /freepbx/branches/2.3:1-4129,4131,4133-4134,4136-4995,5088,5135,5140,5194 /freepbx/trunk:1-5453,5736,5739,5748,5750,5758,5760,5765,5771,5773,5779,5782,5819,5827,5836,5838,5965,5974,6045,6056 to /freepbx/branches/2.3:1-4129,4131,4133-4134,4136-4995,5088,5135,5140,5194 /freepbx/trunk:1-5453,5736,5739,5748,5750,5758,5760,5765,5771,5773,5779,5782,5819,5827,5836,5838,5965,5974,6045,6056,6144
freepbx/branches/2.4/amp_conf/bin/retrieve_conf
r6057 r6145 691 691 // 692 692 $script = $amp_conf['AMPBIN'].'/retrieve_op_conf_from_mysql.pl '.$amportalconf.' '.rtrim($asterisk_conf['astetcdir'],DIRECTORY_SEPARATOR); 693 exec($script); 693 exec($script, $output, $ret); 694 if ($ret) { 695 fatal(sprintf(_("retrieve_op_conf_from_mysql.pl returned with an error code %s"),$ret)); 696 } 694 697 695 698 // generate configuration files
