From ed2c135b38d72a4cbc9a3e3fc3931132da135b38 Mon Sep 17 00:00:00 2001 From: Michal Kleiner Date: Tue, 4 Dec 2018 15:43:53 +1300 Subject: [PATCH 1/2] FIX #241 - Support numerically indexed array of classes --- src/Search/Variants/SearchVariant.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Search/Variants/SearchVariant.php b/src/Search/Variants/SearchVariant.php index a7c5756..4af5c53 100644 --- a/src/Search/Variants/SearchVariant.php +++ b/src/Search/Variants/SearchVariant.php @@ -186,6 +186,11 @@ abstract class SearchVariant // Construct new array of variants applicable to at least one class in the list $commonVariants = []; foreach ($classes as $class => $options) { + // BC for numerically indexed list of classes + if (is_numeric($class) && isset($options['class'])) { + $class = $options['class']; + } + // Extract relevant class options $includeSubclasses = isset($options['include_children']) ? $options['include_children'] : true; From fe5b8b768124e3e6021d2b207dc73389f22ab18e Mon Sep 17 00:00:00 2001 From: Michal Kleiner Date: Tue, 4 Dec 2018 16:51:40 +1300 Subject: [PATCH 2/2] FIX #241 - Minor edits --- src/Search/Variants/SearchVariant.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Search/Variants/SearchVariant.php b/src/Search/Variants/SearchVariant.php index 4af5c53..f1b4463 100644 --- a/src/Search/Variants/SearchVariant.php +++ b/src/Search/Variants/SearchVariant.php @@ -187,8 +187,8 @@ abstract class SearchVariant $commonVariants = []; foreach ($classes as $class => $options) { // BC for numerically indexed list of classes - if (is_numeric($class) && isset($options['class'])) { - $class = $options['class']; + if (is_numeric($class) && !empty($options['class'])) { + $class = $options['class']; // $options['class'] is assumed to exist throughout the code base } // Extract relevant class options