upadted core to 7.69

This commit is contained in:
2020-03-27 14:22:44 +01:00
parent 094d6ec86f
commit ab5d43a397
155 changed files with 819 additions and 606 deletions

View File

@@ -294,6 +294,7 @@ function ajax_render($commands = array()) {
// Now add a command to merge changes and additions to Drupal.settings.
$scripts = drupal_add_js();
drupal_alter('js', $scripts);
if (!empty($scripts['settings'])) {
$settings = $scripts['settings'];
array_unshift($commands, ajax_command_settings(drupal_array_merge_deep_array($settings['data']), TRUE));