fixed input type check in General::getFields()

heimrichhannot · Sep 6, 2022 · 0f5fc55 · 0f5fc55
1 parent 1e7bc8b
commit 0f5fc55
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.15.10] - 2022-09-06
+- Fixed: General::getFields() inputType filter returned wrong values
+
 ## [1.15.9] - 2022-08-23
 - Fixed: warnings in php 8
 

diff --git a/library/Haste/Dca/General.php b/library/Haste/Dca/General.php
@@ -537,19 +537,23 @@ public static function getFields(
 
         $arrOptions = [];
 
+        $evaluateInputType = false;
+        if (!empty($varInputType)) {
+            if (is_string($varInputType)) {
+                $varInputType = [$varInputType];
+            }
+            $evaluateInputType = true;
+        }
+
         foreach ($GLOBALS['TL_DCA'][$strTable]['fields'] as $strField => $arrData) {
             // skip special fields
             if (in_array($strField, $arrSkipFields)) {
                 continue;
             }
 
             // input type
-            if (!empty($varInputType)) {
-                if (
-                    empty($arrData['inputType'])
-                    || (is_array($varInputType) && in_array($arrData['inputType'], $varInputType))
-                    || (is_string($varInputType) && ($arrData['inputType'] != $varInputType))
-                ) {
+            if ($evaluateInputType) {
+                if (empty($arrData['inputType']) || !in_array($arrData['inputType'], $varInputType)) {
                     continue;
                 }
             }