From f3d52c77a9b20aef4b5a12b67e39962f133807aa Mon Sep 17 00:00:00 2001 From: Joseph Rouff Date: Mon, 17 Jan 2011 07:49:30 +0100 Subject: [PATCH] Changes forgotten in view refactoring in 056b6e4d * Several .php template have not been renamed in .php.html --- .../Resources/views/Form/field_group.php.html | 2 +- .../Resources/views/Form/money_field.php.html | 2 +- .../Resources/views/Form/percent_field.php.html | 2 +- .../Templating/Helper/FormHelper.php | 14 ++++++++------ 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_group.php.html b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_group.php.html index 745d4fc87025..7659432fc567 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_group.php.html +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_group.php.html @@ -2,7 +2,7 @@

getVisibleFields() as $child): ?> - render($child, array(), array(), 'FrameworkBundle:Form:field_row.php') ?> + render($child, array(), array(), 'FrameworkBundle:Form:field_row.php.html') ?>

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_field.php.html b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_field.php.html index 1e546a8de466..6b2c448fa429 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_field.php.html +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_field.php.html @@ -1,4 +1,4 @@ render($field, array(), array(), 'FrameworkBundle:Form:number_field.php'), + $view['form']->render($field, array(), array(), 'FrameworkBundle:Form:number_field.php.html'), $field->getPattern() ) ?> diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_field.php.html b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_field.php.html index 7a65a9470b64..14b02df9d035 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_field.php.html +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_field.php.html @@ -1 +1 @@ -render($field, array(), array(), 'FrameworkBundle:Form:number_field.php') ?> % +render($field, array(), array(), 'FrameworkBundle:Form:number_field.php.html') ?> % diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php index fd6dbdc0501a..2dc232c9574c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php @@ -6,6 +6,7 @@ use Symfony\Component\Templating\Engine; use Symfony\Component\Form\FieldInterface; use Symfony\Component\Form\FieldGroupInterface; +use Symfony\Bundle\FrameworkBundle\Templating\DelegatingEngine; /* * This file is part of the Symfony framework. @@ -28,7 +29,8 @@ class FormHelper extends Helper protected $engine; - public function __construct(Engine $engine) + + public function __construct(DelegatingEngine $engine) { $this->engine = $engine; } @@ -109,7 +111,7 @@ public function render(/*FieldInterface */$field, array $attributes = array(), a public function label(/*FieldInterface */$field, $label = false, array $parameters = array(), $template = null) { if (null === $template) { - $template = 'FrameworkBundle:Form:label.php'; + $template = 'FrameworkBundle:Form:label.php.html'; } return $this->engine->render($template, array( @@ -122,7 +124,7 @@ public function label(/*FieldInterface */$field, $label = false, array $paramete public function errors(/*FieldInterface */$field, array $parameters = array(), $template = null) { if (null === $template) { - $template = 'FrameworkBundle:Form:errors.php'; + $template = 'FrameworkBundle:Form:errors.php.html'; } return $this->engine->render($template, array( @@ -134,7 +136,7 @@ public function errors(/*FieldInterface */$field, array $parameters = array(), $ public function hidden(/*FieldGroupInterface */$group, array $parameters = array(), $template = null) { if (null === $template) { - $template = 'FrameworkBundle:Form:hidden.php'; + $template = 'FrameworkBundle:Form:hidden.php.html'; } return $this->engine->render($template, array( @@ -161,7 +163,7 @@ protected function lookupTemplate(/*FieldInterface */$field) $underscoredName = strtolower(preg_replace(array('/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'), array('\\1_\\2', '\\1_\\2'), strtr($className, '_', '.'))); - if ($this->engine->exists($guess = 'FrameworkBundle:Form:'.$underscoredName.'.php')) { + if ($this->engine->exists($guess = 'FrameworkBundle:Form:'.$underscoredName.'.php.html')) { $template = $guess; } @@ -169,7 +171,7 @@ protected function lookupTemplate(/*FieldInterface */$field) } while (null === $template && false !== $currentFqClassName); if (null === $template && $field instanceof FieldGroupInterface) { - $template = 'FrameworkBundle:Form:field_group.php'; + $template = 'FrameworkBundle:Form:field_group.php.html'; } self::$cache[$fqClassName] = $template; pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies: