4 files changed, 41 insertions, 29 deletions
diff --git a/phpBB/phpbb/profilefields/type/type_base.php b/phpBB/phpbb/profilefields/type/type_base.php
index c770a0d93c..9b4bada26d 100644
--- a/phpBB/phpbb/profilefields/type/type_base.php
+++ b/phpBB/phpbb/profilefields/type/type_base.php
@@ -133,7 +133,7 @@ abstract class type_base implements type_interface
 		{
 			foreach ($field_data[$key] as $lang_id => $options)
 			{
-				$field_data[$key][$lang_id] = explode("\n", $options);
+				$field_data[$key][$lang_id] = is_array($options) ? $options : explode("\n", $options);
 			}
 
 			return $current_value;
@@ -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..f6f3f17a6c 100644
--- a/phpBB/phpbb/profilefields/type/type_bool.php
+++ b/phpBB/phpbb/profilefields/type/type_bool.php
@@ -173,7 +173,7 @@ class type_bool extends type_base
 		}
 		else
 		{
-			return $this->lang_helper->is_set($field_id, $lang_id, $field_value + 1);
+			return $this->lang_helper->is_set($field_id, $lang_id, $field_value + 1) ? $this->lang_helper->get($field_id, $lang_id, $field_value + 1) : null;
 		}
 	}
 
@@ -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);
 
@@ -367,29 +367,29 @@ class type_bool extends type_base
 	*/
 	public function prepare_hidden_fields($step, $key, $action, &$field_data)
 	{
-		if ($key == 'l_lang_options' && $this->request->is_set('l_lang_options'))
+		if ($key == 'field_default_value')
 		{
-			return $this->request->variable($key, array(array('')), true);
-		}
-		else if ($key == 'field_default_value')
-		{
-			return $this->request->variable($key, $field_data[$key]);
-		}
-		else
-		{
-			if (!$this->request->is_set($key))
-			{
-				return false;
-			}
-			else if ($key == 'field_ident' && isset($field_data[$key]))
-			{
-				return $field_data[$key];
-			}
-			else
+			$field_length = $this->request->variable('field_length', 0);
+
+			// Do a simple is set check if using checkbox.
+			if ($field_length == 2)
 			{
-				return ($key == 'lang_options') ? $this->request->variable($key, array(''), true) : $this->request->variable($key, '', true);
+				return $this->request->is_set($key);
 			}
+			return $this->request->variable($key, $field_data[$key], true);
+		}
+
+		$default_lang_options = array(
+			'l_lang_options'	=> array(0 => array('')),
+			'lang_options'		=> array(0 => ''),
+		);
+
+		if (isset($default_lang_options[$key]) && $this->request->is_set($key))
+		{
+			return $this->request->variable($key, $default_lang_options[$key], true);
 		}
+
+		return parent::prepare_hidden_fields($step, $key, $action, $field_data);
 	}
 
 	/**
diff --git a/phpBB/phpbb/profilefields/type/type_string_common.php b/phpBB/phpbb/profilefields/type/type_string_common.php
index ff33a7b49c..f5e1992044 100644
--- a/phpBB/phpbb/profilefields/type/type_string_common.php
+++ b/phpBB/phpbb/profilefields/type/type_string_common.php
@@ -18,11 +18,11 @@ abstract class type_string_common extends type_base
 	protected $validation_options = array(
 		'CHARS_ANY'			=> '.*',
 		'NUMBERS_ONLY'		=> '[0-9]+',
-		'ALPHA_ONLY'		=> '[\w]+',
-		'ALPHA_UNDERSCORE'	=> '[\w_]+',
-		'ALPHA_DOTS'        => '[\w.]+',
-		'ALPHA_SPACERS'		=> '[\w\x20_+\-\[\]]+',
-		'ALPHA_PUNCTUATION' => '[a-zA-Z][\w\.,\-_]+',
+		'ALPHA_ONLY'		=> '[a-zA-Z0-9]+',
+		'ALPHA_UNDERSCORE'	=> '[\w]+',
+		'ALPHA_DOTS'        => '[a-zA-Z0-9.]+',
+		'ALPHA_SPACERS'		=> '[\w\x20+\-\[\]]+',
+		'ALPHA_PUNCTUATION' => '[a-zA-Z][\w\.,\-]+',
 		'LETTER_NUM_ONLY'			=> '[\p{Lu}\p{Ll}0-9]+',
 		'LETTER_NUM_UNDERSCORE'		=> '[\p{Lu}\p{Ll}0-9_]+',
 		'LETTER_NUM_DOTS'			=> '[\p{Lu}\p{Ll}0-9.]+',
diff --git a/phpBB/phpbb/profilefields/type/type_url.php b/phpBB/phpbb/profilefields/type/type_url.php
index bc8ac869d0..fe0bffd582 100644
--- a/phpBB/phpbb/profilefields/type/type_url.php
+++ b/phpBB/phpbb/profilefields/type/type_url.php
@@ -64,7 +64,7 @@ class type_url extends type_string
 			return false;
 		}
 
-		if (!preg_match('#^' . get_preg_expression('url') . '$#i', $field_value))
+		if (!preg_match('#^' . get_preg_expression('url') . '$#iu', $field_value))
 		{
 			return $this->user->lang('FIELD_INVALID_URL', $this->get_field_name($field_data['lang_name']));
 		}