Author: david
Date: Thu Feb 16 14:22:05 2012
New Revision: 10921
Log:
Pass module to widget constructor like r8633. Fixes issue 2253
Modified:
trunk/vendor/symfony/lib/widget/sfWidgetFormChoice.class.php
Modified: trunk/vendor/symfony/lib/widget/sfWidgetFormChoice.class.php
==============================================================================
--- trunk/vendor/symfony/lib/widget/sfWidgetFormChoice.class.php Thu Feb
16 13:17:35 2012 (r10920)
+++ trunk/vendor/symfony/lib/widget/sfWidgetFormChoice.class.php Thu Feb
16 14:22:05 2012 (r10921)
@@ -114,6 +114,10 @@
$options = $this->options['renderer_options'];
$options['choices'] = new sfCallable(array($this, 'getChoices'));
+ if (!$this->getOption('expanded'))
+ {
+ $options += array('multiple' => $this->getOption('multiple'));
+ }
$renderer = new $class($options, $this->getAttributes());
@@ -122,11 +126,6 @@
$renderer->setOption('translate_choices', false);
}
- if (!$renderer->hasOption('expanded'))
- {
- $renderer->setOption('multiple', $this->getOption('multiple'));
- }
-
$renderer->setParent($this->getParent());
return $renderer;
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
