core/modules/file/src/Controller/FileWidgetAjaxController.php | 2 +- .../modules/ajax_forms_test/src/Form/AjaxFormsTestLazyLoadForm.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/modules/file/src/Controller/FileWidgetAjaxController.php b/core/modules/file/src/Controller/FileWidgetAjaxController.php index 8c136f1..399d3b6 100644 --- a/core/modules/file/src/Controller/FileWidgetAjaxController.php +++ b/core/modules/file/src/Controller/FileWidgetAjaxController.php @@ -81,7 +81,7 @@ public function upload(Request $request) { $output = drupal_render($form); drupal_process_attached($form); $js = _drupal_add_js(); - $settings = drupal_merge_js_settings($js['settings']['data']); + $settings = drupal_merge_js_settings($js['drupalSettings']['data']); $response = new AjaxResponse(); foreach ($commands as $command) { diff --git a/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestLazyLoadForm.php b/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestLazyLoadForm.php index d81758f..f70d524 100644 --- a/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestLazyLoadForm.php +++ b/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestLazyLoadForm.php @@ -30,7 +30,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { // commands will be a settings command. We can then check the settings // command to ensure that the 'currentPath' setting is not part // of the Ajax response. - $form['#attached']['settings'][] = array( + $form['#attached']['drupalSettings'][] = array( 'test' => 'currentPathUpdate', ); $form['add_files'] = array(