[TikiWiki-commits] [Git][tikiwiki/tiki][master] [FIX] pivottable empty rows/cols/vals arguments become arrays with a single...
"Victor Emanouilov \(@kroky\) via TikiWiki-cvs" <[email protected]>
| Newsgroups | gmane.comp.cms.tiki.cvs |
|---|---|
| Message-ID | <696f35a455e7a_2c28c64a85626c@gitlab-sidekiq-low-urgency-cpu-bound-v2-bcbfd78cc-smmsp.mail> |
Victor Emanouilov pushed to branch master at Tiki Wiki CMS Groupware / Tiki
Commits:
ff3ad947 by Victor Emanouilov at 2026-01-20T09:58:23+02:00
[FIX] pivottable empty rows/cols/vals arguments become arrays with a single empty param which throws an exception
- - - - -
1 changed file:
- lib/wiki-plugins/wikiplugin_pivottable.php
Changes:
=====================================
lib/wiki-plugins/wikiplugin_pivottable.php
=====================================
@@ -834,6 +834,9 @@ function wikiplugin_pivottable($data, $params)
//translating permName to field name for columns and rows
$cols = [];
+ if (! empty($params['cols'])) {
+ $params['cols'] = array_filter($params['cols']);
+ }
if (! empty($params['cols'])) {
foreach ($params['cols'] as $colName) {
if ($params['data'][0] !== 'activitystream' && $field = wikiplugin_pivottable_field_from_definitions(trim($colName), $definitions)) {
@@ -848,6 +851,7 @@ function wikiplugin_pivottable($data, $params)
$rows = [];
if (! empty($params['rows'])) {
+ $params['rows'] = array_filter($params['rows']);
foreach ($params['rows'] as $rowName) {
if ($params['data'][0] !== 'activitystream' && $field = wikiplugin_pivottable_field_from_definitions(trim($rowName), $definitions)) {
$rows[] = $field['name'];
@@ -859,6 +863,7 @@ function wikiplugin_pivottable($data, $params)
$vals = [];
if (! empty($params['vals'])) {
+ $params['vals'] = array_filter($params['vals']);
foreach ($params['vals'] as $valName) {
if ($params['data'][0] !== 'activitystream' && $field = wikiplugin_pivottable_field_from_definitions(trim($valName), $definitions)) {
$vals[] = $field['name'];
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/ff3ad947e3ccea2ce0ae1943e7059769bc59ed85
--
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/ff3ad947e3ccea2ce0ae1943e7059769bc59ed85
You're receiving this email because of your account on gitlab.com.
_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs