From 7c2bcffab133d360d99ed805474dac7076a3d550 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Tue, 20 Jul 2010 10:17:59 +0000
Subject: - Patch #788166 by TR: password_confirm() element breaks if there is
 more than 1 on a page.

---
 modules/user/user.module | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'modules/user/user.module')

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;
 }
-- 
cgit v1.2.3