Ticket #2685: PartialHelper.diff.txt

Index: lib/helper/PartialHelper.php
===================================================================
--- lib/helper/PartialHelper.php    (revision 8279)
+++ lib/helper/PartialHelper.php    (working copy)
@@ -20,7 +20,7 @@
 /**
  * Evaluates and echoes a component slot.
  * The component name is deduced from the definition of the view.yml
- * For a variable to be accessible to the component and its partial, 
+ * For a variable to be accessible to the component and its partial,
  * it has to be passed in the second argument.
  *
  * <b>Example:</b>
@@ -76,7 +76,7 @@
 
 /**
  * Evaluates and echoes a component.
- * For a variable to be accessible to the component and its partial, 
+ * For a variable to be accessible to the component and its partial,
  * it has to be passed in the third argument.
  *
  * <b>Example:</b>
@@ -126,6 +126,11 @@
     }
   }
 
+  $response = $context->getResponse();
+
+  $css = $response->getStylesheets();
+  $js  = $response->getJavascripts();
+
   $controller = $context->getController();
 
   if (!$controller->componentExists($moduleName, $componentName))
@@ -198,7 +203,10 @@
 
     if ($cacheManager)
     {
-      $retval = _set_cache($cacheManager, $uri, $retval);
+      $importedJs = array_diff_key($response->getJavascripts(), $js);
+      $importedCss = array_diff_key($response->getStylesheets(), $css);
+
+      $retval = _set_cache($cacheManager, $uri, $retval, $importedJs, $importedCss);
     }
 
     return $retval;
@@ -269,13 +277,23 @@
     }
   }
 
+  $response = $context->getResponse();
+
+  $css = $response->getStylesheets();
+  $js  = $response->getJavascripts();
+
   $view = new sfPartialView();
   $view->initialize($context, $moduleName, $actionName, '');
   $retval = $view->render($vars);
 
+
+
   if ($cacheManager)
   {
-    $retval = _set_cache($cacheManager, $uri, $retval);
+    $importedJs = array_diff_key($response->getJavascripts(), $js);
+    $importedCss = array_diff_key($response->getStylesheets(), $css);
+
+    $retval = _set_cache($cacheManager, $uri, $retval, $importedJs, $importedCss);
   }
 
   return $retval;
@@ -283,19 +301,39 @@
 
 function _get_cache($cacheManager, $uri)
 {
-  $retval = $cacheManager->get($uri);
+  $datas = @unserialize($cacheManager->get($uri));
+  $retval = null;
+  if (is_array($datas))
+  {
+    $response = sfContext::getInstance()->getResponse();
 
+    foreach ($datas['js'] as $js => $options)
+    {
+      $response->addJavascript($js, '');
+    }
+
+    foreach ($datas['css'] as $css => $options)
+    {
+      $response->addStylesheet($css, '', $options);
+    }
+
+    $retval = $datas['data'];
+  }
+
   if (sfConfig::get('sf_web_debug'))
   {
     $retval = sfWebDebug::getInstance()->decorateContentWithDebug($uri, $retval, false);
   }
 
+
+
   return $retval;
 }
 
-function _set_cache($cacheManager, $uri, $retval)
+function _set_cache($cacheManager, $uri, $retval, $js = array(), $css = array())
 {
-  $saved = $cacheManager->set($retval, $uri);
+  $data = array('data' => $retval, 'css' => $css, 'js' => $js);
+  $saved = $cacheManager->set(serialize($data), $uri);
 
   if ($saved && sfConfig::get('sf_web_debug'))
   {