Author: chabotc
Date: Sat Nov  8 15:29:56 2008
New Revision: 712451

URL: http://svn.apache.org/viewvc?rev=712451&view=rev
Log:
Properly fix the missing entry envelope for single item requests

Modified:
    incubator/shindig/trunk/php/src/social/servlet/DataServiceServlet.php

Modified: incubator/shindig/trunk/php/src/social/servlet/DataServiceServlet.php
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/social/servlet/DataServiceServlet.php?rev=712451&r1=712450&r2=712451&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/social/servlet/DataServiceServlet.php 
(original)
+++ incubator/shindig/trunk/php/src/social/servlet/DataServiceServlet.php Sat 
Nov  8 15:29:56 2008
@@ -97,8 +97,9 @@
                                break;
                }
                header("HTTP/1.0 $code", true);
-               if ($unauthorized)
+               if ($unauthorized) {
                        header("WWW-Authenticate: OAuth realm", true);
+               }
                echo "$code - $errorMessage";
                die();
        }
@@ -119,6 +120,11 @@
                $requestItem = 
RestRequestItem::createWithRequest($servletRequest, $token, $inputConverter, 
$outputConverter);
                $responseItem = 
$this->getResponseItem($this->handleRequestItem($requestItem));
                if ($responseItem->getError() == null) {
+                       $response = $responseItem->getResponse();
+                       if (!($response instanceof DataCollection) && 
!($response instanceof RestfulCollection)) {
+                               $response = array("entry" => $response);
+                               $responseItem->setResponse($response);
+                       }
                        $outputConverter->outputResponse($responseItem, 
$requestItem);
                } else {
                        $this->sendError($responseItem);


Reply via email to