Changeset 4427 for trunk/include/ws_protocols

Timestamp:

Dec 5, 2009, 12:19:26 AM (14 years ago)

Author:

plg

Message:

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

Location:

trunk/include/ws_protocols

Files:

• json_encoder.php (modified) (1 diff)
• php_encoder.php (modified) (1 diff)
• rest_encoder.php (modified) (3 diffs)
• xmlrpc_encoder.php (modified) (1 diff)

trunk/include/ws_protocols/json_encoder.php

@@ -59 +59 @@
   function encodeResponse($response)
   {
-    $respClass = strtolower( get_class($response) );
+    $respClass = strtolower( @get_class($response) );
     if ($respClass=='pwgerror')
     {

trunk/include/ws_protocols/php_encoder.php

@@ -26 +26 @@
   function encodeResponse($response)
   {
-    $respClass = strtolower( get_class($response) );
+    $respClass = strtolower( @get_class($response) );
     if ($respClass=='pwgerror')
     {

trunk/include/ws_protocols/rest_encoder.php

@@ -153 +153 @@
   function encodeResponse($response)
   {
-    $respClass = strtolower( get_class($response) );
+    $respClass = strtolower( @get_class($response) );
     if ($respClass=='pwgerror')
     {
@@ -260 +260 @@
         break;
       case 'object':
-        switch ( strtolower(get_class($data)) )
+        switch ( strtolower(@get_class($data)) )
         {
           case 'pwgnamedarray':
@@ -274 +274 @@
         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 );
     }
   }

trunk/include/ws_protocols/xmlrpc_encoder.php

@@ -65 +65 @@
   function encodeResponse($response)
   {
-    $respClass = strtolower( get_class($response) );
+    $respClass = strtolower( @get_class($response) );
     if ($respClass=='pwgerror')
     {