Merge pull request #13696 from marcusmoore/bug/sc-23796

Fixed potential call to a member function toArray() on null
grokability · Oct 3, 2023 · a2773aa · a2773aa
2 parents 1abcc8b + e82fec2
commit a2773aa
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/app/Models/Labels/Field.php b/app/Models/Labels/Field.php
@@ -21,6 +21,8 @@ public function toArray(Asset $asset) { return Field::makeArray($this, $asset);
 
     public static function makeArray(Field $field, Asset $asset) {
         return $field->getOptions()
+            // filter out any FieldOptions that are accidentally null
+            ->filter()
             ->map(fn($option) => $option->toArray($asset))
             ->filter(fn($result) => $result['value'] != null);
     }
@@ -36,4 +38,4 @@ public static function fromString(string $theString) {
             ->map(fn($optionString) => FieldOption::fromString($optionString));
         return $field;
     }
-}
+}