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-13244-limte-generacion-informes' into 'develop' 

Ent 13244 Limte generación informes

See merge request artica/pandorafms!7118
This commit is contained in:
Daniel Rodriguez 2024-04-04 11:21:28 +00:00
parent 8788160d81 e2133425a0
commit fd4c36f6d0
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/functions_graph.php
View File

@ -4100,7 +4100,7 @@ function fullscale_data(
$data['sum'.$series_suffix]['min'] = $min_value_total;
$data['sum'.$series_suffix]['max'] = $max_value_total;
$data['sum'.$series_suffix]['avg'] = 0;
if (isset($count_data_total) === true) {
if (isset($count_data_total) === true && $count_data_total > 0) {
$data['sum'.$series_suffix]['avg'] = ($sum_data_total / $count_data_total);
}
}

6
pandora_console/include/functions_reporting.php
View File

@ -164,9 +164,13 @@ function shutdown($memory)
unset($memory->reserve);
$error = error_get_last();
if (isset($error['type']) === true && $error['type'] === 1) {
if (isset($error['type'])) {
if ($error['type'] === E_ERROR) {
if (strpos($error['message'], 'Allowed memory size') !== false) {
echo __('You have no memory for this operation, increase the memory limit.');
}
}
}
}