Changeset 10010

Show
Ignore:
Timestamp:
06/30/10 18:16:06 (3 years ago)
Author:
p_lindheimer
Message:

fixes #4388 don't symlink from other fw_fop, fw_ari, fw_langpack modules, they are like framework also re #4382 leftover code deleted

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/branches/2.8/amp_conf/bin/retrieve_conf

    r9977 r10010  
    365365} 
    366366 
    367 // **** Create symlinks array 
    368 $symlink_dirs = array(); 
    369 $symlink_dirs['sounds'] = $amp_conf['ASTVARLIBDIR'].'/sounds'; 
    370 $symlink_dirs['bin']    = $amp_conf['AMPBIN']; 
    371 $symlink_dirs['etc']    = $amp_conf['ASTETCDIR']; 
    372 $symlink_dirs['images'] = $amp_conf['AMPWEBROOT']."/admin/images";  
    373  
    374 $cp_errors = ""; 
    375 $cp_dirs = array(); 
    376 $cp_dirs['agi-bin'] = $amp_conf['ASTAGIDIR']; 
    377  
    378367switch ($db_engine) 
    379368{ 
    …… 
    497486      // some conflicting names 
    498487      // 
    499       if ($key != 'framework') { 
     488      switch ($key) { 
     489        case 'framework': 
     490        case 'fw_fop': 
     491        case 'fw_ari': 
     492        case 'fw_langpacks': 
     493          break; 
     494        default: 
    500495        $con_dirs->symlink_subdirs( $amp_conf['AMPWEBROOT'].'/admin/modules/'.$key ); 
    501496        $con_dirs->cp_subdirs( $amp_conf['AMPWEBROOT'].'/admin/modules/'.$key );