Merge 3.7

This commit is contained in:
Romain Neutron
2012-09-06 14:30:55 +02:00
22 changed files with 50027 additions and 41599 deletions

View File

@@ -388,11 +388,17 @@ class appbox extends base
*/
$upgrader->set_current_message(_('Copying files'));
$origine = $registry->get('GV_RootPath') . 'config/custom_files/';
$target = $registry->get('GV_RootPath') . 'www/custom/';
$filesystem = $core['file-system'];
$filesystem->mirror($origine, $target);
foreach (array(
'config/custom_files/' => 'www/custom/',
'config/minilogos/' => 'www/custom/minilogos/',
'config/stamp/' => 'www/custom/stamp/',
'config/status/' => 'www/custom/status/',
'config/wm/' => 'www/custom/wm/',
) as $source => $target) {
$filesystem->mirror($registry->get('GV_RootPath') . $source, $registry->get('GV_RootPath') . $target);
}
$upgrader->add_steps_complete(1);