svn commit: r949663 - /shindig/trunk/php/src/social/servlet/JsonRpcServlet.php

[lindner]

Author: lindner
Date: Mon May 31 05:18:47 2010
New Revision: 949663

URL: http://svn.apache.org/viewvc?rev=949663&view=rev
Log:
SHINDIG-1144 | JSONN response uses the key "data" instead of "result ", in 
violation of the spec

Modified:
    shindig/trunk/php/src/social/servlet/JsonRpcServlet.php

Modified: shindig/trunk/php/src/social/servlet/JsonRpcServlet.php
URL: 
http://svn.apache.org/viewvc/shindig/trunk/php/src/social/servlet/JsonRpcServlet.php?rev=949663&r1=949662&r2=949663&view=diff
==============================================================================
--- shindig/trunk/php/src/social/servlet/JsonRpcServlet.php (original)
+++ shindig/trunk/php/src/social/servlet/JsonRpcServlet.php Mon May 31 05:18:47 
2010
@@ -114,11 +114,11 @@ class JsonRpcServlet extends ApiServlet 
         // FIXME this is a little hacky because of the field names in the 
RestfulCollection
         $converted->list = $converted->entry;
         unset($converted->entry);
-        $result['data'] = $converted;
+        $result['result'] = $converted;
       } elseif ($response instanceof DataCollection) {
-        $result["data"] = $converted->getEntry();
+        $result["result"] = $converted->getEntry();
       } else {
-        $result["data"] = $converted;
+        $result["result"] = $converted;
       }
     }
     return $result;