diff options
Diffstat (limited to 'misc/ajax.js')
| -rw-r--r-- | misc/ajax.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/misc/ajax.js b/misc/ajax.js index d61af3ec8..1ded01ca8 100644 --- a/misc/ajax.js +++ b/misc/ajax.js @@ -406,7 +406,12 @@ Drupal.ajax.prototype.commands = { * Command to set the settings that will be used for other commands in this response. */ settings: function (ajax, response, status) { - ajax.settings = response.settings; + if (response.merge) { + $.extend(true, Drupal.settings, response.settings); + } + else { + ajax.settings = response.settings; + } }, /** |