Skip to content

Commit 5cc431e

Browse files
Jakosmg6511
andauthored
Fix usage of checkRequirement method (#16718)
### What does it do? Fix wrong check of checkRequirement method ### Why is it needed? checkRequirement result contains a string or true. So the check will never have a false result and the error is not sent. ### Related issue(s)/PR(s) None known. --------- Co-authored-by: Jim Graham <[email protected]>
1 parent 806094f commit 5cc431e

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

Diff for: core/src/Revolution/Rest/modRestController.php

+9-6
Original file line numberDiff line numberDiff line change
@@ -668,8 +668,9 @@ public function post()
668668
$properties = $this->getProperties();
669669

670670
if (!empty($this->postRequiredFields)) {
671-
if (!$this->checkRequiredFields($this->postRequiredFields)) {
672-
return $this->failure($this->modx->lexicon('error'));
671+
$result = $this->checkRequiredFields($this->postRequiredFields);
672+
if ($result !== true) {
673+
return $this->failure($result);
673674
}
674675
}
675676

@@ -744,8 +745,9 @@ public function put()
744745
}
745746

746747
if (!empty($this->putRequiredFields)) {
747-
if (!$this->checkRequiredFields($this->putRequiredFields)) {
748-
return $this->failure();
748+
$result = $this->checkRequiredFields($this->putRequiredFields);
749+
if ($result !== true) {
750+
return $this->failure($result);
749751
}
750752
}
751753

@@ -819,8 +821,9 @@ public function delete()
819821
}
820822

821823
if (!empty($this->deleteRequiredFields)) {
822-
if (!$this->checkRequiredFields($this->deleteRequiredFields)) {
823-
return $this->failure();
824+
$result = $this->checkRequiredFields($this->deleteRequiredFields);
825+
if ($result !== true) {
826+
return $this->failure($result);
824827
}
825828
}
826829

0 commit comments

Comments
 (0)