From 339924c871c2996c30e2eb65fd8e418eaa8bfe1d Mon Sep 17 00:00:00 2001
From: Thomas Jakobi <thomas.jakobi@partout.info>
Date: Tue, 18 Mar 2025 08:33:30 +0100
Subject: [PATCH] Fix wrong check of checkRequirement method

2.x Port of #16718
---
 core/model/modx/rest/modrestcontroller.class.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/core/model/modx/rest/modrestcontroller.class.php b/core/model/modx/rest/modrestcontroller.class.php
index 04313b509f9..87ab3d68071 100644
--- a/core/model/modx/rest/modrestcontroller.class.php
+++ b/core/model/modx/rest/modrestcontroller.class.php
@@ -583,8 +583,9 @@ public function post() {
         }
 
         if (!empty($this->postRequiredRelatedObjects)) {
-            if (!$this->checkRequiredRelatedObjects($this->postRequiredRelatedObjects)) {
-                return $this->failure();
+            $result = $this->checkRequiredFields($this->postRequiredFields);
+            if ($result !== true) {
+                return $this->failure($result);
             }
         }
 
@@ -650,8 +651,9 @@ public function put() {
         }
 
         if (!empty($this->putRequiredRelatedObjects)) {
-            if (!$this->checkRequiredRelatedObjects($this->putRequiredRelatedObjects)) {
-                return $this->failure();
+            $result = $this->checkRequiredFields($this->putRequiredFields);
+            if ($result !== true) {
+                return $this->failure($result);
             }
         }
 
@@ -710,8 +712,9 @@ public function delete() {
         }
 
         if (!empty($this->deleteRequiredFields)) {
-            if (!$this->checkRequiredFields($this->deleteRequiredFields)) {
-                return $this->failure();
+            $result = $this->checkRequiredFields($this->deleteRequiredFields);
+            if ($result !== true) {
+                return $this->failure($result);
             }
         }