svn commit: r725736 - in /incubator/shindig/branches/1.0.x-incubating/php/src: gadgets/servlet/GadgetRenderingServlet.php social/servlet/ApiServlet.php

[chabotc]

Author: chabotc
Date: Thu Dec 11 08:36:48 2008
New Revision: 725736

URL: http://svn.apache.org/viewvc?rev=725736&view=rev
Log:
sync up w trunk, almost done :)

Modified:
    
incubator/shindig/branches/1.0.x-incubating/php/src/gadgets/servlet/GadgetRenderingServlet.php
    
incubator/shindig/branches/1.0.x-incubating/php/src/social/servlet/ApiServlet.php

Modified: 
incubator/shindig/branches/1.0.x-incubating/php/src/gadgets/servlet/GadgetRenderingServlet.php
URL: 
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/php/src/gadgets/servlet/GadgetRenderingServlet.php?rev=725736&r1=725735&r2=725736&view=diff
==============================================================================
--- 
incubator/shindig/branches/1.0.x-incubating/php/src/gadgets/servlet/GadgetRenderingServlet.php
 (original)
+++ 
incubator/shindig/branches/1.0.x-incubating/php/src/gadgets/servlet/GadgetRenderingServlet.php
 Thu Dec 11 08:36:48 2008
@@ -163,7 +163,7 @@
     // Forced libs first.
     if (! empty($forcedLibs)) {
       $libs = explode(':', $forcedLibs);
-      echo sprintf($externFmt, Config::get('default_js_prefix') . 
$this->getJsUrl($libs, $gadget) . "&container=" . $context->getContainer()) . 
"\n";
+      $content .= sprintf($externFmt, Config::get('default_js_prefix') . 
$this->getJsUrl($libs, $gadget) . "&container=" . $context->getContainer()) . 
"\n";
     }
     $content .= "<script>\n";
     

Modified: 
incubator/shindig/branches/1.0.x-incubating/php/src/social/servlet/ApiServlet.php
URL: 
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/php/src/social/servlet/ApiServlet.php?rev=725736&r1=725735&r2=725736&view=diff
==============================================================================
--- 
incubator/shindig/branches/1.0.x-incubating/php/src/social/servlet/ApiServlet.php
 (original)
+++ 
incubator/shindig/branches/1.0.x-incubating/php/src/social/servlet/ApiServlet.php
 Thu Dec 11 08:36:48 2008
@@ -66,6 +66,7 @@
 
   public function __construct() {
     parent::__construct();
+    $this->setNoCache(true);
     $this->handlers[self::$PEOPLE_ROUTE] = new PersonHandler();
     $this->handlers[self::$ACTIVITY_ROUTE] = new ActivityHandler();
     $this->handlers[self::$APPDATA_ROUTE] = new AppDataHandler();