Skip to content

Commit

Permalink
Merge pull request from GHSA-mfvg-qwcw-qvc8
Browse files Browse the repository at this point in the history
  • Loading branch information
gondoh committed Mar 23, 2023
2 parents 08247f0 + 9297629 commit 922025a
Showing 1 changed file with 11 additions and 8 deletions.
19 changes: 11 additions & 8 deletions lib/Baser/Model/Behavior/BcUploadBehavior.php
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,20 @@ public function getFileUploader(Model $model)
*
* @param Model $Model
* @param array $options
* @return mixed
* @return void
*/
public function afterValidate(Model $Model, $options = [])
{
if($this->validatingLock[$Model->alias]) return true;
$Model->data[$Model->alias] = $this->BcFileUploader[$Model->alias]->setupRequestData(isset($Model->data[$Model->alias])? $Model->data[$Model->alias] : $Model->data);
$Model->data[$Model->alias] = $this->BcFileUploader[$Model->alias]->setupTmpData(isset($Model->data[$Model->alias])? $Model->data[$Model->alias] : $Model->data);
$this->oldEntity[$Model->alias] = (!empty($Model->data[$Model->alias]['id']))? $this->getOldEntity($Model, $Model->data[$Model->alias]['id']) : [];
$this->validatingLock[$Model->alias] = true;
if ($Model->validationErrors) {
return;
}
if ($this->validatingLock[$Model->alias]) {
return;
}
$Model->data[$Model->alias] = $this->BcFileUploader[$Model->alias]->setupRequestData(isset($Model->data[$Model->alias])? $Model->data[$Model->alias] : $Model->data);
$Model->data[$Model->alias] = $this->BcFileUploader[$Model->alias]->setupTmpData(isset($Model->data[$Model->alias])? $Model->data[$Model->alias] : $Model->data);
$this->oldEntity[$Model->alias] = (!empty($Model->data[$Model->alias]['id']))? $this->getOldEntity($Model, $Model->data[$Model->alias]['id']) : [];
$this->validatingLock[$Model->alias] = true;

// @deprecated 後方互換 since v4.5.6, v5.0.0 で削除予定
// CuApprover-4.3.2以下に対応するための処理
Expand All @@ -133,8 +138,6 @@ public function afterValidate(Model $Model, $options = [])
}
}
// <<<

return true;
}

/**
Expand Down

0 comments on commit 922025a

Please sign in to comment.