Changeset 10234

Timestamp:

07/12/08 02:47:20 (4 months ago)

Author:

dwhittle

Message:

dwhittle: merged changes to branch

Files:

• branches/dwhittle/1.1/lib/helper/PartialHelper.php (modified) (1 diff)
• branches/dwhittle/1.1/lib/view/sfPartialView.class.php (modified) (3 diffs)
• branches/dwhittle/1.2/lib/helper/PartialHelper.php (modified) (2 diffs)
• branches/dwhittle/1.2/lib/view/sfPartialView.class.php (modified) (3 diffs)

branches/dwhittle/1.1/lib/helper/PartialHelper.php

@@ -142 +142 @@
-  $actionName = '_'.$componentName;
-
+  $viewClass = sfConfig::get('mod_'.$moduleName.'_partial_view_class', 'sf').'PartialView';
+  $view = new $viewClass($context, $moduleName, $actionName, '');
+  $view->setPartialVars($vars);
+
+  if ($retval = $view->getCache())
+  {
+    return $retval;
+  }
+
-  $allVars = _call_component($moduleName, $componentName, $vars);
-
-  if (!is_null($allVars))
-  {
-    $viewClass = sfConfig::get('mod_'.$moduleName.'_partial_view_class', 'sf').'PartialView';
-
-    // render
-    $view = new $viewClass($context, $moduleName, $actionName, '');
-    $view->setPartialVars($vars);
-    $view->getAttributeHolder()->add($allVars);
-

branches/dwhittle/1.1/lib/view/sfPartialView.class.php

@@ -67 +67 @@
-    }
-
-sfConfig::get('sf_cache'
+$retval = $this->getCache(
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-    }
-
@@ -95 +88 @@
-    if (sfConfig::get('sf_cache'))
-    {
-viewCache->setPartialCache($this->moduleName, $this->actionName, $
+this->viewCache->setPartialCache($this->moduleName, $this->actionName, $this->
-      $this->context->setResponse($mainResponse);
-      $mainResponse->merge($response);
@@ -107 +100 @@
-    return $retval;
-  }
+
+  public function getCache()
+  {
+    if (!sfConfig::get('sf_cache'))
+    {
+      return null;
+    }
+
+    $this->viewCache = $this->context->getViewCacheManager();
+    $this->viewCache->registerConfiguration($this->moduleName);
+
+    $this->cacheKey = $this->viewCache->computeCacheKey($this->partialVars);
+    if ($retval = $this->viewCache->getPartialCache($this->moduleName, $this->actionName, $this->cacheKey))
+    {
+      return $retval;
+    }
+  }
-}

branches/dwhittle/1.2/lib/helper/PartialHelper.php

@@ -137 +137 @@
-  $actionName = '_'.$componentName;
-
+  $view = new sfPartialView($context, $moduleName, $actionName, '');
+  $view->setPartialVars($vars);
+
+  if ($retval = $view->getCache())
+  {
+    return $retval;
+  }
+
-  $allVars = _call_component($moduleName, $componentName, $vars);
-
@@ -142 +150 @@
-  {
-    // render
-    $view = new sfPartialView($context, $moduleName, $actionName, '');
-    $view->setPartialVars($vars);
-    $view->getAttributeHolder()->add($allVars);
-

branches/dwhittle/1.2/lib/view/sfPartialView.class.php

@@ -67 +67 @@
-    }
-
-sfConfig::get('sf_cache'
+$retval = $this->getCache(
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-    }
-
@@ -95 +88 @@
-    if (sfConfig::get('sf_cache'))
-    {
-viewCache->setPartialCache($this->moduleName, $this->actionName, $
+this->viewCache->setPartialCache($this->moduleName, $this->actionName, $this->
-      $this->context->setResponse($mainResponse);
-      $mainResponse->merge($response);
@@ -107 +100 @@
-    return $retval;
-  }
+
+  public function getCache()
+  {
+    if (!sfConfig::get('sf_cache'))
+    {
+      return null;
+    }
+
+    $this->viewCache = $this->context->getViewCacheManager();
+    $this->viewCache->registerConfiguration($this->moduleName);
+
+    $this->cacheKey = $this->viewCache->computeCacheKey($this->partialVars);
+    if ($retval = $this->viewCache->getPartialCache($this->moduleName, $this->actionName, $this->cacheKey))
+    {
+      return $retval;
+    }
+  }
-}