Changeset 5134

Show
Ignore:
Timestamp:
10/22/07 12:56:52 (6 years ago)
Author:
p_lindheimer
Message:

Merged revisions 5132 via svnmerge from
http://svn.freepbx.org/freepbx/trunk

........

r5132 | p_lindheimer | 2007-10-22 09:48:36 -0700 (Mon, 22 Oct 2007) | 1 line


change search path for retrieve_conf_post_custom from AMPBIN to AMPLOCALBIN which must be defined

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/branches/2.3

    • Property svnmerge-integrated changed from /freepbx/branches/2.2:1-4145,4434,4437 /freepbx/trunk:1-4133,4135-4136,4140-5015,5017-5035,5040-5042,5068,5076,5095,5107,5117,5122,5124 to /freepbx/branches/2.2:1-4145,4434,4437 /freepbx/trunk:1-4133,4135-4136,4140-5015,5017-5035,5040-5042,5068,5076,5095,5107,5117,5122,5124,5132

  • freepbx/branches/2.3/amp_conf/bin/retrieve_conf

    r5036 r5134  
    637637// have bad consequences and can cripple the system. 
    638638// 
    639 $post_custom = $amp_conf['AMPBIN'].'/retrieve_conf_post_custom'; 
    640 if (file_exists($post_custom)) { 
    641   outn(sprintf(_("Found script %s, executing.."), $post_custom)); 
    642   include($post_custom); 
    643   out(_("OK")); 
     639if (isset($amp_conf['AMPLOCALBIN'])) { 
     640$post_custom = $amp_conf['AMPLOCALBIN'].'/retrieve_conf_post_custom'; 
     641  if (file_exists($post_custom)) { 
     642    outn(sprintf(_("Found script %s, executing.."), $post_custom)); 
     643    include($post_custom); 
     644    out(_("OK")); 
     645  } 
    644646} 
    645647