tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-6211-Revisar-actualizacion-online-open' into 'develop' 

fixed open online update

See merge request artica/pandorafms!3420
This commit is contained in:
Alejandro Fraguas 2020-09-01 15:55:33 +02:00
parent bc88ca7acf 0345d36d08
commit 7d3bc0b67f
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/functions.php
View File

@ -3361,6 +3361,10 @@ function get_number_of_mr($package, $ent, $offline)
$sqlfiles_num = preg_replace($pattern, $replacement, $sqlfiles);
foreach ($sqlfiles_num as $num) {
if ($num <= $config['MR']) {
continue;
}
$mr_size[] = $num;
}
}

8
pandora_console/include/functions_update_manager.php
View File

@ -1843,9 +1843,15 @@ function update_manager_recurse_copy($src, $dst, $black_list)
while (false !== ( $file = readdir($dir))) {
if (( $file != '.' ) && ( $file != '..' ) && (!in_array($file, $black_list))) {
if (is_dir($src.'/'.$file)) {
$dir_dst = $dst;
if ($file != 'pandora_console') {
$dir_dst .= '/'.$file;
}
if (!update_manager_recurse_copy(
$src.'/'.$file,
$dst.'/'.$file,
$dir_dst,
$black_list
)
) {