From b05e8a5e34e338f48fa274bdaa6a0540d7a5432e Mon Sep 17 00:00:00 2001 From: jsatoh Date: Thu, 8 May 2014 05:47:57 +0000 Subject: [PATCH] 2014-05-08 Junichi Satoh * godmode/servers/manage_recontask.php, godmode/servers/manage_recontask_form.php: Replaced json_encode() with io_json_mb_encode() to avoid invalid encoding with multi-byte characters. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9887 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 +++++++ pandora_console/godmode/servers/manage_recontask.php | 2 +- pandora_console/godmode/servers/manage_recontask_form.php | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 08f8b2fe99..d0ee4c1555 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2014-05-08 Junichi Satoh + + * godmode/servers/manage_recontask.php, + godmode/servers/manage_recontask_form.php: Replaced json_encode() + with io_json_mb_encode() to avoid invalid encoding with multi-byte + characters. + 2014-05-07 Alejandro Gallardo * include/functions_visual_map.php: Now the linked diff --git a/pandora_console/godmode/servers/manage_recontask.php b/pandora_console/godmode/servers/manage_recontask.php index f8fcdb9c16..1db7738d9e 100644 --- a/pandora_console/godmode/servers/manage_recontask.php +++ b/pandora_console/godmode/servers/manage_recontask.php @@ -106,7 +106,7 @@ if ((isset ($_GET["update"])) OR ((isset ($_GET["create"])))) { } } - $macros = json_encode($macros); + $macros = io_json_mb_encode($macros); } // -------------------------------- diff --git a/pandora_console/godmode/servers/manage_recontask_form.php b/pandora_console/godmode/servers/manage_recontask_form.php index 6cc7481b22..0ac4ce226b 100644 --- a/pandora_console/godmode/servers/manage_recontask_form.php +++ b/pandora_console/godmode/servers/manage_recontask_form.php @@ -51,7 +51,7 @@ if (is_ajax ()) { $macros['base64'] = base64_encode($recon_script_macros); $macros['array'] = json_decode($recon_script_macros,true); - echo json_encode($macros); + echo io_json_mb_encode($macros); return; }