From b9292473de96b1d3925b959d3b3a55efaf264ef2 Mon Sep 17 00:00:00 2001
From: Sami Mokaddem <sami.mokaddem@circl.lu>
Date: Mon, 13 Feb 2023 15:38:12 +0100
Subject: [PATCH] fix: [crud:index] Only include requested metafields for
 non-API queries

---
 src/Controller/Component/CRUDComponent.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Controller/Component/CRUDComponent.php b/src/Controller/Component/CRUDComponent.php
index 1166d6a..953a6db 100644
--- a/src/Controller/Component/CRUDComponent.php
+++ b/src/Controller/Component/CRUDComponent.php
@@ -76,10 +76,9 @@ class CRUDComponent extends Component
         if (!empty($options['order'])) {
             $query->order($options['order']);
         }
-        if ($this->Controller->ParamHandler->isRest()) {
-            if ($this->metaFieldsSupported()) {
-                $query = $this->includeRequestedMetaFields($query);
-            }
+        if ($this->metaFieldsSupported() && !$this->Controller->ParamHandler->isRest()) {
+            $query = $this->includeRequestedMetaFields($query);
+        }
         if (!$this->Controller->ParamHandler->isRest()) {
             $this->setRequestedEntryAmount();
         }