3 files changed, 17 insertions, 5 deletions
diff --git a/phpBB/phpbb/auth/provider/db.php b/phpBB/phpbb/auth/provider/db.php
index 722eeffa9a..ba67c11e75 100644
--- a/phpBB/phpbb/auth/provider/db.php
+++ b/phpBB/phpbb/auth/provider/db.php
@@ -87,7 +87,7 @@ class db extends \phpbb\auth\provider\base
 
 		$username_clean = utf8_clean_string($username);
 
-		$sql = 'SELECT user_id, username, user_password, user_passchg, user_email, user_type, user_login_attempts
+		$sql = 'SELECT *
 			FROM ' . USERS_TABLE . "
 			WHERE username_clean = '" . $this->db->sql_escape($username_clean) . "'";
 		$result = $this->db->sql_query($sql);
@@ -123,7 +123,7 @@ class db extends \phpbb\auth\provider\base
 				'username_clean'		=> $username_clean,
 			);
 			$sql = 'INSERT INTO ' . LOGIN_ATTEMPT_TABLE . $this->db->sql_build_array('INSERT', $attempt_data);
-			$result = $this->db->sql_query($sql);
+			$this->db->sql_query($sql);
 		}
 		else
 		{
@@ -175,7 +175,7 @@ class db extends \phpbb\auth\provider\base
 		}
 
 		// Check password ...
-		if ($this->passwords_manager->check($password, $row['user_password']))
+		if ($this->passwords_manager->check($password, $row['user_password'], $row))
 		{
 			// Check for old password hash...
 			if ($this->passwords_manager->convert_flag || strlen($row['user_password']) == 32)
diff --git a/phpBB/phpbb/profilefields/type/type_base.php b/phpBB/phpbb/profilefields/type/type_base.php
index 52f5d15511..9b4bada26d 100644
--- a/phpBB/phpbb/profilefields/type/type_base.php
+++ b/phpBB/phpbb/profilefields/type/type_base.php
@@ -158,7 +158,19 @@ abstract class type_base implements type_interface
 		}
 		else
 		{
-			return $this->request->variable($key, '', true);
+			$default_value = '';
+			$lang_fields = array(
+				'l_lang_name',
+				'l_lang_explain',
+				'l_lang_default_value',
+				'l_lang_options',
+			);
+
+			if (in_array($key, $lang_fields))
+			{
+				$default_value = array(0 => '');
+			}
+			return $this->request->variable($key, $default_value, true);
 		}
 	}
 
diff --git a/phpBB/phpbb/profilefields/type/type_bool.php b/phpBB/phpbb/profilefields/type/type_bool.php
index 0582722833..75934e3be7 100644
--- a/phpBB/phpbb/profilefields/type/type_bool.php
+++ b/phpBB/phpbb/profilefields/type/type_bool.php
@@ -352,7 +352,7 @@ class type_bool extends type_base
 			}
 		}
 
-		if ($step == 3 && ($field_data[$key] || $action != 'edit') && $key == 'l_lang_options')
+		if ($key == 'l_lang_options' && $this->request->is_set($key))
 		{
 			$field_data[$key] = $this->request->variable($key, array(0 => array('')), true);