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-8836-post-macros-para-custom-data-de-eventos-no-funcionan-sin-base64' into 'develop' 

Ent 8836 post macros para custom data de eventos no funcionan sin base64

See merge request artica/pandorafms!4879
This commit is contained in:
Diego Muñoz-Reja 2022-08-01 13:02:00 +00:00
parent 2a5d075d03 a2be858a7d
commit 4cbd23d911
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/functions_events.php
View File

@ -3755,7 +3755,7 @@ function events_get_response_target(
// Parse the event custom data.
if (empty($event['custom_data']) === false) {
$custom_data = json_decode(base64_decode($event['custom_data']));
$custom_data = json_decode($event['custom_data']);
foreach ($custom_data as $key => $value) {
$target = str_replace('_customdata_'.$key.'_', $value, $target);
}
@ -4297,7 +4297,7 @@ function events_page_custom_data($event)
$table->head = [];
$table->class = 'table_modal_alternate';
$json_custom_data = base64_decode($event['custom_data']);
$json_custom_data = $event['custom_data'];
$custom_data = json_decode($json_custom_data);
if ($custom_data === null) {
@ -5308,7 +5308,7 @@ function events_get_field_value_by_event_id(
// Parse the event custom data.
if (!empty($event['custom_data'])) {
$custom_data = json_decode(base64_decode($event['custom_data']));
$custom_data = json_decode($event['custom_data']);
foreach ($custom_data as $key => $val) {
$value = str_replace('_customdata_'.$key.'_', $val, $value);
}