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

merge -r21965 from trunk fix web service optional array parameters were always transformed to arrays

Browse source 
git-svn-id: http://piwigo.org/svn/branches/2.5@21966 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices 2013-04-02 04:07:28 +00:00
parent b8b697c2dd
commit 37d8f78f9e
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/ws_core.inc.php
View file

@ -412,10 +412,6 @@ Request format: ".@$this->_requestFormat." Response format: ".@$this->_responseF
{
$flags |= WS_PARAM_OPTIONAL;
}
if ( $flags & WS_PARAM_FORCE_ARRAY )
{
$flags |= WS_PARAM_ACCEPT_ARRAY;
}
$options['flags'] = $flags;
$params[$param] = $options;
}
@ -496,7 +492,7 @@ Request format: ".@$this->_requestFormat." Response format: ".@$this->_responseF
else if ( array_key_exists('default',$options) )
{
$params[$name] = $options['default'];
if ( ($flags&WS_PARAM_FORCE_ARRAY) )
if ( ($flags&WS_PARAM_FORCE_ARRAY)==WS_PARAM_FORCE_ARRAY )
{
$this->makeArrayParam( $params[$name] );
}
@ -509,7 +505,7 @@ Request format: ".@$this->_requestFormat." Response format: ".@$this->_responseF
{
return new PwgError(WS_ERR_INVALID_PARAM, $name.' must be scalar' );
}
if ( ($flags&WS_PARAM_FORCE_ARRAY) )
if ( ($flags&WS_PARAM_FORCE_ARRAY)==WS_PARAM_FORCE_ARRAY )
{
$this->makeArrayParam( $the_param );
}