Changeset 4426


Ignore:
Timestamp:
Dec 5, 2009, 12:18:46 AM (14 years ago)
Author:
plg
Message:

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".

Location:
branches/2.0/include
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/2.0/include/ws_core.inc.php

    r3046 r4426  
    270270  private static function _removeNamedArray(&$value)
    271271  {
    272     if ( strtolower( get_class($value) ) =='pwgnamedarray')
     272    if ( strtolower( @get_class($value) ) =='pwgnamedarray')
    273273    {
    274274      $value = $value->_content;
     
    280280  private static function _removeNamedStruct(&$value)
    281281  {
    282     if ( strtolower( get_class($value) ) =='pwgnamedstruct')
     282    if ( strtolower( @get_class($value) ) =='pwgnamedstruct')
    283283    {
    284284      if ( isset($value->_content['']) )
     
    525525    }
    526526    $result = trigger_event('ws_invoke_allowed', true, $methodName, $params);
    527     if ( strtolower( get_class($result) )!='pwgerror')
     527    if ( strtolower( @get_class($result) )!='pwgerror')
    528528    {
    529529      if ( !empty($method['include']) )
  • branches/2.0/include/ws_protocols/json_encoder.php

    r3046 r4426  
    5959  function encodeResponse($response)
    6060  {
    61     $respClass = strtolower( get_class($response) );
     61    $respClass = strtolower( @get_class($response) );
    6262    if ($respClass=='pwgerror')
    6363    {
  • branches/2.0/include/ws_protocols/php_encoder.php

    r3046 r4426  
    2626  function encodeResponse($response)
    2727  {
    28     $respClass = strtolower( get_class($response) );
     28    $respClass = strtolower( @get_class($response) );
    2929    if ($respClass=='pwgerror')
    3030    {
  • branches/2.0/include/ws_protocols/rest_encoder.php

    r3046 r4426  
    153153  function encodeResponse($response)
    154154  {
    155     $respClass = strtolower( get_class($response) );
     155    $respClass = strtolower( @get_class($response) );
    156156    if ($respClass=='pwgerror')
    157157    {
     
    260260        break;
    261261      case 'object':
    262         switch ( strtolower(get_class($data)) )
     262        switch ( strtolower(@get_class($data)) )
    263263        {
    264264          case 'pwgnamedarray':
     
    274274        break;
    275275      default:
    276         trigger_error("Invalid type ". gettype($data)." ".get_class($data), E_USER_WARNING );
     276        trigger_error("Invalid type ". gettype($data)." ".@get_class($data), E_USER_WARNING );
    277277    }
    278278  }
  • branches/2.0/include/ws_protocols/xmlrpc_encoder.php

    r3046 r4426  
    6565  function encodeResponse($response)
    6666  {
    67     $respClass = strtolower( get_class($response) );
     67    $respClass = strtolower( @get_class($response) );
    6868    if ($respClass=='pwgerror')
    6969    {
Note: See TracChangeset for help on using the changeset viewer.