From ebfdc1f7185da02181700ce8e5f2a56ac12e7f45 Mon Sep 17 00:00:00 2001 From: ralf Date: Fri, 18 Feb 2022 11:01:33 +0200 Subject: [PATCH] fix array_combine requires same number of values as keys --- api/etemplate.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/api/etemplate.php b/api/etemplate.php index 0f1d54183c..d0bb0a521d 100644 --- a/api/etemplate.php +++ b/api/etemplate.php @@ -93,7 +93,12 @@ function send_template() if (isset($names)) { $names = explode(',', $names); - $attrs = array_diff(array_combine($names, explode(',', $matches[4], count($names))), ['', null]); + $values = Api\Etemplate\Widget::csv_split($matches[4], count($names)); + if (count($values) < count($names)) + { + $values = array_merge($values, array_fill(count($values), count($names)-count($values), '')); + } + $attrs = array_diff(array_combine($names, $values), ['', null]); // fix select options can be either multiple or empty_label if ($matches[1] === 'select' && !empty($attrs['empty_label']) && (int)$attrs['empty_label'] > 0) {