Author: francois
Date: 2010-03-29 21:18:17 +0200 (Mon, 29 Mar 2010)
New Revision: 28873
Modified:
plugins/sfPropel15Plugin/trunk/lib/widget/sfWidgetFormPropelChoice.class.php
Log:
[sfPropel15Plugin] Fixed regression in sfWidgetFormPropelChoice (closes #8466)
Modified:
plugins/sfPropel15Plugin/trunk/lib/widget/sfWidgetFormPropelChoice.class.php
===================================================================
---
plugins/sfPropel15Plugin/trunk/lib/widget/sfWidgetFormPropelChoice.class.php
2010-03-29 18:45:50 UTC (rev 28872)
+++
plugins/sfPropel15Plugin/trunk/lib/widget/sfWidgetFormPropelChoice.class.php
2010-03-29 19:18:17 UTC (rev 28873)
@@ -83,7 +83,7 @@
$criteria = PropelQuery::from($this->getOption('model'));
if ($this->getOption('criteria'))
{
- $query->mergeWith($this->getOption('criteria'));
+ $criteria->mergeWith($this->getOption('criteria'));
}
foreach ($this->getOption('query_methods') as $method)
{
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" 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/symfony-svn?hl=en.
