svn commit: r1094333 - /shindig/trunk/php/src/social/service/HttpHandler.php

[bhofmann]

Author: bhofmann
Date: Mon Apr 18 07:51:51 2011
New Revision: 1094333

URL: http://svn.apache.org/viewvc?rev=1094333&view=rev
Log:
PHP: fixed parsing for Content-Type JSON on osapi.http requests

Modified:
    shindig/trunk/php/src/social/service/HttpHandler.php

Modified: shindig/trunk/php/src/social/service/HttpHandler.php
URL: 
http://svn.apache.org/viewvc/shindig/trunk/php/src/social/service/HttpHandler.php?rev=1094333&r1=1094332&r2=1094333&view=diff
==============================================================================
--- shindig/trunk/php/src/social/service/HttpHandler.php (original)
+++ shindig/trunk/php/src/social/service/HttpHandler.php Mon Apr 18 07:51:51 
2011
@@ -54,8 +54,13 @@ class HttpHandler extends DataRequestHan
       $context = new $contextClass('GADGET');
       $response = $makeRequest->fetch($context, $options);
 
+      // try to decode json object here since in order
+      // to not break gadgets.io.makeRequest functionality
+      // $response->getResponseContent() has to return a string
+      $content = json_decode($response->getResponseContent(), true);
+
       $result = array(
-        'content' => $response->getResponseContent(),
+        'content' => $content ? $content : $response->getResponseContent(),
         'status' => $response->getHttpCode(),
         'headers' => $response->getResponseHeaders()
       );