From bb0acbd05beba382ad40d932ee1b047a27b71fcc Mon Sep 17 00:00:00 2001
From: Aurelien Navarre <aurelien.navarre@gmail.com>
Date: Mon, 7 Sep 2015 15:59:13 +0200
Subject: [PATCH] 2177769-18

---
 core/modules/user/user.js     | 6 +++---
 core/modules/user/user.module | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/modules/user/user.js b/core/modules/user/user.js
index 3bc95a8..7c829b1 100644
--- a/core/modules/user/user.js
+++ b/core/modules/user/user.js
@@ -133,10 +133,10 @@
     var $usernameBox = $('input.username');
     var username = ($usernameBox.length > 0) ? $usernameBox.val() : translate.username;
 
-    // Lose 5 points for every character less than 6, plus a 30 point penalty.
-    if (password.length < 6) {
+    // Lose 5 points for every character less than 12, plus a 30 point penalty.
+    if (password.length < 12) {
       msg.push(translate.tooShort);
-      strength -= ((6 - password.length) * 5) + 30;
+      strength -= ((12 - password.length) * 5) + 30;
     }
 
     // Count weaknesses.
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 55473bb..6987b65 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -1251,7 +1251,7 @@ function user_form_process_password_confirm($element) {
     $password_settings += array(
       'strengthTitle' => t('Password strength:'),
       'hasWeaknesses' => t('To make your password stronger:'),
-      'tooShort' => t('Make it at least 6 characters'),
+      'tooShort' => t('Make it at least 12 characters'),
       'addLowerCase' => t('Add lowercase letters'),
       'addUpperCase' => t('Add uppercase letters'),
       'addNumbers' => t('Add numbers'),
-- 
2.1.4

