summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
Diffstat (limited to 'includes')
-rw-r--r--includes/ajax.inc9
1 files changed, 2 insertions, 7 deletions
diff --git a/includes/ajax.inc b/includes/ajax.inc
index 899ab4547..af7e6da22 100644
--- a/includes/ajax.inc
+++ b/includes/ajax.inc
@@ -613,15 +613,10 @@ function ajax_pre_render_element($element) {
$settings += array(
'path' => 'system/ajax',
'options' => array(),
- 'selector' => '#' . $element['#id'],
- 'effect' => 'none',
- 'speed' => 'none',
- 'method' => 'replaceWith',
- 'progress' => array('type' => 'throbber'),
);
// @todo Legacy support. Remove in Drupal 8.
- if ($settings['method'] == 'replace') {
+ if (isset($settings['method']) && $settings['method'] == 'replace') {
$settings['method'] = 'replaceWith';
}
@@ -659,7 +654,7 @@ function ajax_pre_render_element($element) {
}
// Convert a simple #ajax['progress'] string into an array.
- if (is_string($settings['progress'])) {
+ if (isset($settings['progress']) && is_string($settings['progress'])) {
$settings['progress'] = array('type' => $settings['progress']);
}
// Change progress path to a full URL.