Skip to content

Commit cb76b1e

Browse files
committed
Fix validation flow for updating
1 parent 6ecc88e commit cb76b1e

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

src/Model.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Base Model
99
*
1010
* @author Nick Tsai <myintaer@gmail.com>
11-
* @version 2.16.1
11+
* @version 2.16.2
1212
* @see https://github.com/yidas/codeigniter-model
1313
*/
1414
class Model extends \CI_Model implements \ArrayAccess
@@ -702,13 +702,13 @@ public function replace($attributes, $runValidation=true)
702702
*/
703703
public function update($attributes, $condition=NULL, $runValidation=true)
704704
{
705-
// Model Condition
706-
$query = $this->_findByCondition($condition);
707-
708705
// Validation
709706
if ($runValidation && false===$attributes=$this->validate($attributes, true))
710707
return false;
711708

709+
// Model Condition
710+
$query = $this->_findByCondition($condition);
711+
712712
$attributes = $this->_attrEventBeforeUpdate($attributes);
713713

714714
// Pack query then move it to write DB from read DB
@@ -746,12 +746,13 @@ public function batchUpdate(Array $dataSet, $withAll=false, $maxLength=4*1024*10
746746
if ($withAll===true) {
747747
$this->withAll();
748748
}
749-
// Model Condition
750-
$query = $this->_findByCondition($condition);
751749

752750
// Validation
753751
if ($runValidation && false===$attributes=$this->validate($attributes, true))
754752
return false;
753+
754+
// Model Condition
755+
$query = $this->_findByCondition($condition);
755756

756757
$attributes = $this->_attrEventBeforeUpdate($attributes);
757758

0 commit comments

Comments
 (0)