Show
Ignore:
Timestamp:
02/24/11 15:43:32 (2 years ago)
Author:
p_lindheimer
Message:

fixes #4868 don't redeclare parse_amportal_conf() during upgrades

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/branches/2.9/amp_conf/htdocs/admin/libraries/freepbx_conf.class.php

    r11586 r11589  
    10401040} 
    10411041 
    1042  
    10431042/** DEPRECATED: $amp_conf provided by bootstrap or use freepbx_conf class. 
     1043 * this must be in a if (!function_exists('parse_amportal_conf')) because during 
     1044 * upgrading from 2.8 to 2.9, the old functions.inc.php is currently loaded 
     1045 * and calls functions which include this. 
    10441046 * 
    1045  * @param string  filename of amportal.conf to pas to parse_amportal_conf method 
     1047 * @param string  filename of amportal.conf to pass to parse_amportal_conf method 
    10461048 * 
    10471049 * @return array  $amp_conf array 
    10481050 */ 
    1049 function parse_amportal_conf($conf) { 
    1050  
    1051   freepbx_log(FPBX_LOG_ERROR,'parse_amportal_conf() is deprecated. Use of bootstrap.php creates $amp_conf'); 
    1052  
    1053   $freepbx_conf =& freepbx_conf::create(); 
    1054   return $freepbx_conf->parse_amportal_conf($conf); 
     1051if (!function_exists('parse_amportal_conf')) { 
     1052  function parse_amportal_conf($conf) { 
     1053 
     1054    freepbx_log(FPBX_LOG_ERROR,'parse_amportal_conf() is deprecated. Use of bootstrap.php creates $amp_conf'); 
     1055 
     1056    $freepbx_conf =& freepbx_conf::create(); 
     1057    return $freepbx_conf->parse_amportal_conf($conf); 
     1058  } 
    10551059} 
    10561060?>