archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge r12694 from branch 2.3 to trunk

Browse source 
bug 2529 fixed: Piwigo API can only handle the "rest" requestFormat.
If we try to search for another request format the only result is an
"Unknown request format" error for the client. This error happens when
always_populate_raw_post_data is On (which is not the default Apache
setting).



git-svn-id: http://piwigo.org/svn/trunk@12695 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2011-12-05 09:09:55 +00:00
parent 489beffd6e
commit cdf47f824c
1 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ws.php
View file

@ -507,7 +507,7 @@ add_event_handler('ws_add_methods', 'ws_addDefaultMethods');
add_event_handler('ws_invoke_allowed', 'ws_isInvokeAllowed', EVENT_HANDLER_PRIORITY_NEUTRAL, 3);
$requestFormat = null;
$requestFormat = 'rest';
$responseFormat = null;
if ( isset($_GET['format']) )
@ -515,22 +515,6 @@ if ( isset($_GET['format']) )
$responseFormat = $_GET['format'];
}
if ( isset($HTTP_RAW_POST_DATA) )
{
$HTTP_RAW_POST_DATA = trim($HTTP_RAW_POST_DATA);
if ( strncmp($HTTP_RAW_POST_DATA, '<?xml', 5) == 0 )
{
}
else
{
$requestFormat = "json";
}
}
else
{
$requestFormat = "rest";
}
if ( !isset($responseFormat) and isset($requestFormat) )
{
$responseFormat = $requestFormat;