Author: Kris.Wallsmith
Date: 2010-03-20 15:13:37 +0100 (Sat, 20 Mar 2010)
New Revision: 28632

Modified:
   
branches/1.3/lib/plugins/sfPropelPlugin/lib/validator/sfValidatorPropelChoice.class.php
   
branches/1.4/lib/plugins/sfPropelPlugin/lib/validator/sfValidatorPropelChoice.class.php
Log:
[1.3, 1.4] fixed call to doCount (closes #7196)

Modified: 
branches/1.3/lib/plugins/sfPropelPlugin/lib/validator/sfValidatorPropelChoice.class.php
===================================================================
--- 
branches/1.3/lib/plugins/sfPropelPlugin/lib/validator/sfValidatorPropelChoice.class.php
     2010-03-20 11:50:22 UTC (rev 28631)
+++ 
branches/1.3/lib/plugins/sfPropelPlugin/lib/validator/sfValidatorPropelChoice.class.php
     2010-03-20 14:13:37 UTC (rev 28632)
@@ -76,7 +76,7 @@
 
       $criteria->addAnd($this->getColumn(), $value, Criteria::IN);
 
-      $dbcount = 
call_user_func(array(constant($this->getOption('model').'::PEER'), 'doCount'), 
$criteria, $this->getOption('connection'));
+      $dbcount = 
call_user_func(array(constant($this->getOption('model').'::PEER'), 'doCount'), 
$criteria, false, $this->getOption('connection'));
 
       if ($dbcount != $count)
       {
@@ -87,7 +87,7 @@
     {
       $criteria->addAnd($this->getColumn(), $value);
 
-      $dbcount = 
call_user_func(array(constant($this->getOption('model').'::PEER'), 'doCount'), 
$criteria, $this->getOption('connection'));
+      $dbcount = 
call_user_func(array(constant($this->getOption('model').'::PEER'), 'doCount'), 
$criteria, false, $this->getOption('connection'));
 
       if (0 === $dbcount)
       {

Modified: 
branches/1.4/lib/plugins/sfPropelPlugin/lib/validator/sfValidatorPropelChoice.class.php
===================================================================
--- 
branches/1.4/lib/plugins/sfPropelPlugin/lib/validator/sfValidatorPropelChoice.class.php
     2010-03-20 11:50:22 UTC (rev 28631)
+++ 
branches/1.4/lib/plugins/sfPropelPlugin/lib/validator/sfValidatorPropelChoice.class.php
     2010-03-20 14:13:37 UTC (rev 28632)
@@ -76,7 +76,7 @@
 
       $criteria->addAnd($this->getColumn(), $value, Criteria::IN);
 
-      $dbcount = 
call_user_func(array(constant($this->getOption('model').'::PEER'), 'doCount'), 
$criteria, $this->getOption('connection'));
+      $dbcount = 
call_user_func(array(constant($this->getOption('model').'::PEER'), 'doCount'), 
$criteria, false, $this->getOption('connection'));
 
       if ($dbcount != $count)
       {
@@ -87,7 +87,7 @@
     {
       $criteria->addAnd($this->getColumn(), $value);
 
-      $dbcount = 
call_user_func(array(constant($this->getOption('model').'::PEER'), 'doCount'), 
$criteria, $this->getOption('connection'));
+      $dbcount = 
call_user_func(array(constant($this->getOption('model').'::PEER'), 'doCount'), 
$criteria, false, $this->getOption('connection'));
 
       if (0 === $dbcount)
       {

-- 
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.

Reply via email to