Navigation

Changeset 6057

Timestamp:

07/19/08 08:01:28 (3 months ago)

Author:

p_lindheimer

Message:

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

........

r6056 | p_lindheimer | 2008-07-19 08:00:24 -0700 (Sat, 19 Jul 2008) | 1 line

#2924 don't symlink or copy files from framework in retrieve_conf

........

Files:

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 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

r5966	r6057
320	320
321	321	// create symlinks for files in appropriate sub directories
322		symlink_subdirs( $amp_conf['AMPWEBROOT'].'/admin/modules/'.$key );
323		cp_subdirs( $amp_conf['AMPWEBROOT'].'/admin/modules/'.$key );
	322	// don't symlink framework files, it is a special case module that happens to have
	323	// some conflicting names
	324	//
	325	if ($key != 'framework') {
	326	symlink_subdirs( $amp_conf['AMPWEBROOT'].'/admin/modules/'.$key );
	327	cp_subdirs( $amp_conf['AMPWEBROOT'].'/admin/modules/'.$key );
	328	}
324	329	}
325	330	}