diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-07-20 10:17:59 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-07-20 10:17:59 +0000 |
| commit | 7c2bcffab133d360d99ed805474dac7076a3d550 (patch) | |
| tree | f4b0212781dd60e0b750da20c22e407e15d08f4a /modules/user/user.module | |
| parent | 18516bd9713145dbfcf57dc801c211a9976b8768 (diff) | |
| download | brdo-7c2bcffab133d360d99ed805474dac7076a3d550.tar.gz brdo-7c2bcffab133d360d99ed805474dac7076a3d550.tar.bz2 | |
- Patch #788166 by TR: password_confirm() element breaks if there is more than 1 on a page.
Diffstat (limited to 'modules/user/user.module')
| -rw-r--r-- | modules/user/user.module | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/modules/user/user.module b/modules/user/user.module index c07aa1461..3b3c6b2b4 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -3361,7 +3361,12 @@ function user_form_process_password_confirm($element) { ); $element['#attached']['js'][] = drupal_get_path('module', 'user') . '/user.js'; - $element['#attached']['js'][] = array('data' => $js_settings, 'type' => 'setting'); + // Ensure settings are only added once per page. + static $already_added = FALSE; + if (!$already_added) { + $already_added = TRUE; + $element['#attached']['js'][] = array('data' => $js_settings, 'type' => 'setting'); + } return $element; } |