From 23b51e8b52654717af3b617aabf99aa7888ac4ac Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Wed, 23 Dec 2015 14:07:19 +0100 Subject: [PATCH] Re-introduce getValues() override for subform values in wizard pages Wizard pages don't subclass ConfigForm for which the patch was intended. Sorry for the bug. refs #10905 --- .../setup/application/forms/AuthBackendPage.php | 15 +++++++++++++++ .../application/forms/UserGroupBackendPage.php | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/modules/setup/application/forms/AuthBackendPage.php b/modules/setup/application/forms/AuthBackendPage.php index 85f5cf82ec..24ca72b8d0 100644 --- a/modules/setup/application/forms/AuthBackendPage.php +++ b/modules/setup/application/forms/AuthBackendPage.php @@ -116,6 +116,21 @@ public function createElements(array $formData) $this->addSubForm($backendForm, 'backend_form'); } + /** + * Retrieve all form element values + * + * @param bool $suppressArrayNotation Ignored + * + * @return array + */ + public function getValues($suppressArrayNotation = false) + { + $values = parent::getValues(); + $values = array_merge($values, $values['backend_form']); + unset($values['backend_form']); + return $values; + } + /** * Validate the given form data and check whether it's possible to authenticate using the configured backend * diff --git a/modules/setup/application/forms/UserGroupBackendPage.php b/modules/setup/application/forms/UserGroupBackendPage.php index 7764848fe5..272949d541 100644 --- a/modules/setup/application/forms/UserGroupBackendPage.php +++ b/modules/setup/application/forms/UserGroupBackendPage.php @@ -129,4 +129,19 @@ public function createElements(array $formData) ) ); } + + /** + * Retrieve all form element values + * + * @param bool $suppressArrayNotation Ignored + * + * @return array + */ + public function getValues($suppressArrayNotation = false) + { + $values = parent::getValues(); + $values = array_merge($values, $values['backend_form']); + unset($values['backend_form']); + return $values; + } }