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/json_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/json_encoder.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/ws_protocols/json_encoder.php b/include/ws_protocols/json_encoder.php index 5931b8595..7e56ded2a 100644 --- a/include/ws_protocols/json_encoder.php +++ b/include/ws_protocols/json_encoder.php @@ -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( |