Changeset 9313 for branches/1.1/lib

Timestamp:

05/27/08 12:50:00 (5 years ago)

Author:

fabien

Message:

fixed template.filter_parameters event + added a sf_type variable in all templates to get the template type (action, layout, or partial)

Files:

• branches/1.1/lib/view/sfPHPView.class.php (modified) (3 diffs)
• branches/1.1/lib/view/sfPartialView.class.php (modified) (1 diff)
• branches/1.1/lib/view/sfViewParameterHolder.class.php (modified) (1 diff)

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

@@ -70 +70 @@
-
-    // EXTR_REFS can't be used (see #3595 and #3151)
-attributeHolder->toArray
+dispatcher->filter(new sfEvent($this, 'template.filter_parameters'), $this->attributeHolder->toArray())->getReturnValue
-
-    // render
@@ -130 +130 @@
-
-    $this->attributeHolder = $this->initializeAttributeHolder(array('sf_content' => new sfOutputEscaperSafe($content)));
+    $this->attributeHolder->set('sf_type', 'layout');
-
-    // render the decorator template and return the result
@@ -165 +166 @@
-      $this->preRenderCheck();
-
+      $this->attributeHolder->set('sf_type', 'action');
+
-      // render template file
-      $content = $this->renderFile($this->getDirectory().'/'.$this->getTemplate());

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

@@ -89 +89 @@
-    $this->preRenderCheck();
-
+    $this->getAttributeHolder()->set('sf_type', 'partial');
+
-    // render template
-    $retval = $this->renderFile($this->getDirectory().'/'.$this->getTemplate());

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

@@ -54 +54 @@
-    $this->dispatcher = $dispatcher;
-
-    $event = $dispatcher->filter(new sfEvent($this, 'template.filter_parameters'), $parameters);
-    $parameters = $event->getReturnValue();
-
-    $this->add($parameters);
-