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_core.inc.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 'include/ws_core.inc.php')
| -rw-r--r-- | include/ws_core.inc.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/ws_core.inc.php b/include/ws_core.inc.php index 6d27d0b93..d7548fa79 100644 --- a/include/ws_core.inc.php +++ b/include/ws_core.inc.php @@ -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']) ) { |