Changeset 8273

Show
Ignore:
Timestamp:
09/04/09 19:44:43 (2 years ago)
Author:
p_lindheimer
Message:

fixes #3858 reload deprecated starting 1.4 changed to module_reload

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/branches/2.6/amp_conf/htdocs/admin/functions.inc.php

    r8117 r8273  
    14961496 
    14971497function do_reload() { 
    1498   global $amp_conf, $asterisk_conf, $db, $astman; 
     1498  global $amp_conf, $asterisk_conf, $db, $astman, $version; 
     1499 
     1500  if (empty($version)) { 
     1501    $engine_info = engine_getinfo(); 
     1502    $version = $engine_info['version']; 
     1503  } 
    14991504   
    15001505  $notify =& notifications::create($db); 
    …… 
    15441549   
    15451550  //reload asterisk 
    1546   $astman->send_request('Command', array('Command'=>'reload'));  
     1551  if (version_compare($version,'1.4','lt')) { 
     1552    $astman->send_request('Command', array('Command'=>'reload'));  
     1553  } else { 
     1554    $astman->send_request('Command', array('Command'=>'module reload'));   
     1555  } 
    15471556   
    15481557  $return['status'] = true; 
    …… 
    36563665function freepbx_debug($string, $option='a', $filename='/tmp/freepbx_debug.log') { 
    36573666  $fh = fopen($filename,$option); 
    3658   if (is_array($string)) { 
     3667  if (is_array($string) || is_object($string)) { 
    36593668    fwrite($fh,print_r($string,true)."\n"); 
    36603669  } else {