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

bug 1211 fixed: with PHP 5.3, the get_class function requires the input

Browse Source 
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:
plegall
2009-12-04 23:18:46 +00:00
parent cbe2d9a168
commit 4d706af6f5
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/ws_core.inc.php
+3 -3
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']) )
{
include/ws_protocols/json_encoder.php
+1 -1
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(
include/ws_protocols/php_encoder.php
+1 -1
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(
include/ws_protocols/rest_encoder.php
+3 -3
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 );
}
}
}
include/ws_protocols/xmlrpc_encoder.php
+1 -1
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();