8000 Adds a new variable "origin" in the return value of method "label ()" by laupiFrpar · Pull Request #24 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

Adds a new variable "origin" in the return value of method "label ()" #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Adds a new variable "origin" in the return value of method "label ()" #24

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
10ff7bd
Fixes a fatal error in file Symfony/Bundle/FrameworkBundle/Resources/…
Oct 14, 2010
65dfa06
Merge branch 'master' of http://github.com/symfony/symfony
Oct 22, 2010
ad240f6
Merge branch 'master' of http://github.com/symfony/symfony
Oct 25, 2010
b25c7f5
Remove my fix
Oct 25, 2010
7db57c5
Adds a new variable "origin" in the return value of method label() in…
Oct 26, 2010
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fixes a fatal error in file Symfony/Bundle/FrameworkBundle/Resources/… 
…views/Form/widget/textarea_field.php : Call to undefined method

Symfony\Bundle\FrameworkBundle\Templating\Form\Field::getDisplayedData()
  • Loading branch information
Pierre-Louis LAUNAY committed Oct 14, 2010
commit 10ff7bdd62ea9cadfa1361a1b307b918fab4f39e
4 changes: 2 additions & 2 deletions src/Symfony/Bundle/FrameworkBundle/Templating/Form/Field.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@ public function widget(array $attributes = array(), $template = null)
}

return $this->engine->render($template, array(
'field' => $this,
'field' => $this->field,
'origin' => $this->field,
'attributes' => array_merge($this->field->getAttributes(), $attributes),
'generator' => $this->generator,
));
}

public function label($label, $template = null)
public function label($label = false, $template = null)
{
if (null === $template) {
$template = 'FrameworkBundle:Form:label.php';
Expand Down
0