diff options
| author | plegall <plg@piwigo.org> | 2009-12-04 23:19:26 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2009-12-04 23:19:26 +0000 |
| commit | 9c5cfbc789e691ff85eb6ab6928980577cadf203 (patch) | |
| tree | e0f0f7ed2364a25f68184407d112026cf46e9a16 /include/ws_protocols/rest_encoder.php | |
| parent | 110ce79b3c218bf05b61a84365a45357d36ec764 (diff) | |
merge r4426 from branch 2.0 to trunk
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
Diffstat (limited to '')
| -rw-r--r-- | include/ws_protocols/rest_encoder.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/ws_protocols/rest_encoder.php b/include/ws_protocols/rest_encoder.php index eb71d60fc..d0797f05b 100644 --- a/include/ws_protocols/rest_encoder.php +++ b/include/ws_protocols/rest_encoder.php @@ -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 ); } } } |