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

merge r4426 from branch 2.0 to trunk

Browse source 
bug 1211 fixed: with PHP 5.3, the get_class function requires the input
parameter to be an object, or else throws a E_WARNING message. In webservices
files, I have replaced all "get_class" calls by "@get_class".


git-svn-id: http://piwigo.org/svn/trunk@4427 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2009-12-04 23:19:26 +00:00
commit 9c5cfbc789
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/ws_core.inc.php
View file

@ -269,7 +269,7 @@ class PwgResponseEncoder
private static function _removeNamedArray(&$value)
{
if ( strtolower( get_class($value) ) =='pwgnamedarray')
if ( strtolower( @get_class($value) ) =='pwgnamedarray')
{
$value = $value->_content;
return 1;
@ -279,7 +279,7 @@ class PwgResponseEncoder
private static function _removeNamedStruct(&$value)
{
if ( strtolower( get_class($value) ) =='pwgnamedstruct')
if ( strtolower( @get_class($value) ) =='pwgnamedstruct')
{
if ( isset($value->_content['']) )
{
@ -524,7 +524,7 @@ Request format: ".@$this->_requestFormat." Response format: ".@$this->_responseF
return new PwgError(WS_ERR_MISSING_PARAM, 'Missing parameters: '.implode(',',$missing_params));
}
$result = trigger_event('ws_invoke_allowed', true, $methodName, $params);
if ( strtolower( get_class($result) )!='pwgerror')
if ( strtolower( @get_class($result) )!='pwgerror')
{
if ( !empty($method['include']) )
{

2
include/ws_protocols/json_encoder.php
View file

@ -58,7 +58,7 @@ class PwgJsonEncoder extends PwgResponseEncoder
{
function encodeResponse($response)
{
$respClass = strtolower( get_class($response) );
$respClass = strtolower( @get_class($response) );
if ($respClass=='pwgerror')
{
return json_encode(

2
include/ws_protocols/php_encoder.php
View file

@ -25,7 +25,7 @@ class PwgSerialPhpEncoder extends PwgResponseEncoder
{
function encodeResponse($response)
{
$respClass = strtolower( get_class($response) );
$respClass = strtolower( @get_class($response) );
if ($respClass=='pwgerror')
{
return serialize(

6
include/ws_protocols/rest_encoder.php
View file

@ -152,7 +152,7 @@ class PwgRestEncoder extends PwgResponseEncoder
{
function encodeResponse($response)
{
$respClass = strtolower( get_class($response) );
$respClass = strtolower( @get_class($response) );
if ($respClass=='pwgerror')
{
$ret = '<?xml version="1.0"?>
@ -259,7 +259,7 @@ class PwgRestEncoder extends PwgResponseEncoder
}
break;
case 'object':
switch ( strtolower(get_class($data)) )
switch ( strtolower(@get_class($data)) )
{
case 'pwgnamedarray':
$this->encode_array($data->_content, $data->_itemName, $data->_xmlAttributes);
@ -273,7 +273,7 @@ class PwgRestEncoder extends PwgResponseEncoder
}
break;
default:
trigger_error("Invalid type ". gettype($data)." ".get_class($data), E_USER_WARNING );
trigger_error("Invalid type ". gettype($data)." ".@get_class($data), E_USER_WARNING );
}
}
}

2
include/ws_protocols/xmlrpc_encoder.php
View file

@ -64,7 +64,7 @@ class PwgXmlRpcEncoder extends PwgResponseEncoder
{
function encodeResponse($response)
{
$respClass = strtolower( get_class($response) );
$respClass = strtolower( @get_class($response) );
if ($respClass=='pwgerror')
{
$code = $response->code();