mirror of
https://github.com/Piwigo/Piwigo.git
synced 2026-07-06 09:52:29 +02:00
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/branches/2.0@4426 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
@@ -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(
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -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 );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user