Merge branch 'ent-9387-meta-php7-2-error-500-en-vista-alert-view' into 'develop'

fixed 500 php7.2 pandora_enterprise#9387

See merge request artica/pandorafms!5054
This commit is contained in:
Diego Muñoz-Reja 2022-08-11 12:10:03 +00:00
commit 4ebf49a7db

View File

@ -244,7 +244,7 @@ if ($free_search != '') {
[ [
'title' => 'Policy', 'title' => 'Policy',
'text' => 'P.', 'text' => 'P.',
], ]
); );
$columns = array_merge( $columns = array_merge(
@ -261,12 +261,12 @@ if ($free_search != '') {
'title' => 'Validate', 'title' => 'Validate',
'text' => html_print_checkbox('all_validate', 0, false, true, false), 'text' => html_print_checkbox('all_validate', 0, false, true, false),
'class' => 'dt-left', 'class' => 'dt-left',
], ]
); );
$columns = array_merge( $columns = array_merge(
['validate'], ['validate'],
$columns, $columns
); );
} }
@ -276,7 +276,7 @@ if ($free_search != '') {
[ [
'title' => 'Force execution', 'title' => 'Force execution',
'text' => 'F.', 'text' => 'F.',
], ]
); );
$columns = array_merge( $columns = array_merge(
@ -289,12 +289,12 @@ if ($free_search != '') {
if ($print_agent === true) { if ($print_agent === true) {
array_push( array_push(
$column_names, $column_names,
['text' => 'Agent'], ['text' => 'Agent']
); );
$columns = array_merge( $columns = array_merge(
$columns, $columns,
['agent'], ['agent']
); );
} }
@ -304,7 +304,7 @@ if ($free_search != '') {
['text' => 'Template'], ['text' => 'Template'],
['text' => 'Action'], ['text' => 'Action'],
['text' => 'Last fired'], ['text' => 'Last fired'],
['text' => 'Status'], ['text' => 'Status']
); );
$columns = array_merge( $columns = array_merge(
@ -313,7 +313,7 @@ if ($free_search != '') {
['template'], ['template'],
['action'], ['action'],
['lastFired'], ['lastFired'],
['status'], ['status']
); );
@ -381,7 +381,7 @@ if ($free_search != '') {
], ],
'no_toggle' => true, 'no_toggle' => true,
], ],
], ]
); );
} else { } else {
ui_print_datatable( ui_print_datatable(
@ -419,7 +419,7 @@ if ($free_search != '') {
$strict_user $strict_user
), ),
], ],
], ]
); );
} }