From 9c5cfbc789e691ff85eb6ab6928980577cadf203 Mon Sep 17 00:00:00 2001 From: plegall Date: Fri, 4 Dec 2009 23:19:26 +0000 Subject: 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 --- include/ws_core.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/ws_core.inc.php') 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']) ) { -- cgit v1.2.3