adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-07 17:23:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix web service optional array parameters were always transformed to arrays

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@21965 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2013-04-02 04:04:51 +00:00
parent 1f9fd210b8
commit c75ba6ba1d
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/ws_core.inc.php
+2 -6
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 );
}