aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2020-01-03 10:17:40 +0100
committerMarc Alexander <admin@m-a-styles.de>2020-01-03 10:17:40 +0100
commita0ffbfce315ce45df4085d4c83536f2024e71a3f (patch)
tree201f829eb36dfeac07de172fcc7ce3bb8ae58347
parentd50d1101fbe991abcc7c42b7e624d4c202c2a8a1 (diff)
downloadforums-a0ffbfce315ce45df4085d4c83536f2024e71a3f.tar
forums-a0ffbfce315ce45df4085d4c83536f2024e71a3f.tar.gz
forums-a0ffbfce315ce45df4085d4c83536f2024e71a3f.tar.bz2
forums-a0ffbfce315ce45df4085d4c83536f2024e71a3f.tar.xz
forums-a0ffbfce315ce45df4085d4c83536f2024e71a3f.zip
[ticket/16287] Correctly pass json response to PHP file
PHPBB3-16287
-rw-r--r--phpBB/adm/style/ajax.js2
-rw-r--r--phpBB/includes/acp/acp_help_phpbb.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index b9424723bb..39b63e4696 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -74,7 +74,7 @@ phpbb.prepareSendStats = function () {
var $sendStatisticsSuccess = $('<input />', {
type: 'hidden',
name: 'send_statistics_response',
- value: res
+ value: JSON.stringify(res)
});
$sendStatisticsSuccess.appendTo('p.submit-buttons');
diff --git a/phpBB/includes/acp/acp_help_phpbb.php b/phpBB/includes/acp/acp_help_phpbb.php
index 2b603d63f4..798cff5cee 100644
--- a/phpBB/includes/acp/acp_help_phpbb.php
+++ b/phpBB/includes/acp/acp_help_phpbb.php
@@ -90,7 +90,7 @@ class acp_help_phpbb
if (!empty($response))
{
- $decoded_response = json_decode($response, true);
+ $decoded_response = json_decode(htmlspecialchars_decode($response), true);
if ($decoded_response && isset($decoded_response['status']) && $decoded_response['status'] == 'ok')
{