composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-12 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/3.0' into develop

Browse Source 
# Conflicts:
#	tests/php-unit-tests/unitary-tests/webservices/RestTest.php
This commit is contained in:
Molkobain
2023-04-18 22:37:59 +02:00
parent 60ae3621c5 778118cfb4
commit 6fbe66d2ec
2 changed files with 45 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webservices/rest.php
View File

@@ -260,7 +260,6 @@ $sCallback = utils::ReadParam('callback', null);
if ($sCallback == null)
{
$oP = new JsonPage();
$oP->SetOutputDataOnly(true);
}
else
{
@@ -268,6 +267,7 @@ else
}
$oP->add_header('Access-Control-Allow-Origin: *');
$oP->SetData(json_decode($sResponse, true));
$oP->SetOutputDataOnly(true);
$oP->Output();
// Log usage