Changeset 7959

Timestamp:

03/19/08 05:37:43 (7 months ago)

Author:

dwhittle

Message:

1.1: tweaked decorator handling (removed redundant call and moved to config handler)

Files:

• branches/1.1/lib/config/sfViewConfigHandler.class.php (modified) (2 diffs)
• branches/1.1/lib/view/sfPHPView.class.php (modified) (1 diff)
• branches/1.1/lib/view/sfView.class.php (modified) (1 diff)

branches/1.1/lib/config/sfViewConfigHandler.class.php

@@ -162 +162 @@
-  {
-    $data = '';
-
-    if ($this->getConfigValue('has_layout', $viewName) && false !== $layout = $this->getConfigValue('layout', $viewName))
-    {
-
+
+
-    }
-
@@ -171 +171 @@
-    // So, we check if the user requested has_layout: true or if he gave a layout: name for this particular action
-    $localLayout = isset($this->yamlConfig[$viewName]['layout']) || isset($this->yamlConfig[$viewName]['has_layout']);
-$data
+isset($data)
-    {
-      $data = "  if (!\$this->context->getRequest()->isXmlHttpRequest())\n  {\n  $data  }\n";

branches/1.1/lib/view/sfPHPView.class.php

@@ -106 +106 @@
-    require($this->context->getConfigCache()->checkConfig('modules/'.$this->moduleName.'/config/view.yml'));
-
-    // decorator configuration
-    $this->setDecoratorTemplate(sfConfig::get('symfony.view.'.$this->moduleName.'_'.$this->actionName.'_layout'));
-
-    // set template directory
-    if (!$this->directory)

branches/1.1/lib/view/sfView.class.php

@@ -129 +129 @@
-    $this->parameterHolder->add(sfConfig::get('mod_'.strtolower($moduleName).'_view_param', array()));
-
-    $this->decoratorDirectory = sfConfig::get('sf_app_template_dir');
-
-    // include view configuration
-    $this->configure();