7 files changed, 82 insertions, 11 deletions
diff --git a/phpBB/phpbb/profilefields/type/type_base.php b/phpBB/phpbb/profilefields/type/type_base.php
index cb262d54a8..2fd4c50f6b 100644
--- a/phpBB/phpbb/profilefields/type/type_base.php
+++ b/phpBB/phpbb/profilefields/type/type_base.php
@@ -95,4 +95,12 @@ abstract class type_base implements type_interface
 			return $this->request->variable($key, '', true);
 		}
 	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function display_options(&$template_vars, &$field_data)
+	{
+		return;
+	}
 }
diff --git a/phpBB/phpbb/profilefields/type/type_bool.php b/phpBB/phpbb/profilefields/type/type_bool.php
index f303e40213..016ceb6000 100644
--- a/phpBB/phpbb/profilefields/type/type_bool.php
+++ b/phpBB/phpbb/profilefields/type/type_bool.php
@@ -326,4 +326,25 @@ class type_bool extends type_base
 			}
 		}
 	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function display_options(&$template_vars, &$field_data)
+	{
+		// Initialize these array elements if we are creating a new field
+		if (!sizeof($field_data['lang_options']))
+		{
+			// No options have been defined for a boolean field.
+			$field_data['lang_options'][0] = '';
+			$field_data['lang_options'][1] = '';
+		}
+
+		$template_vars = array_merge($template_vars, array(
+			'S_BOOL'					=> true,
+			'L_LANG_OPTIONS_EXPLAIN'	=> $this->user->lang['BOOL_ENTRIES_EXPLAIN'],
+			'FIRST_LANG_OPTION'			=> $field_data['lang_options'][0],
+			'SECOND_LANG_OPTION'		=> $field_data['lang_options'][1],
+		));
+	}
 }
diff --git a/phpBB/phpbb/profilefields/type/type_date.php b/phpBB/phpbb/profilefields/type/type_date.php
index 9c706af7a3..301e05c9ae 100644
--- a/phpBB/phpbb/profilefields/type/type_date.php
+++ b/phpBB/phpbb/profilefields/type/type_date.php
@@ -314,7 +314,7 @@ class type_date extends type_base
 			{
 				return 'now';
 			}
-			else if ($this->request->is_set'field_default_value_day'))
+			else if ($this->request->is_set('field_default_value_day'))
 			{
 				$field_data['field_default_value_day'] = $this->request->variable('field_default_value_day', 0);
 				$field_data['field_default_value_month'] = $this->request->variable('field_default_value_month', 0);
diff --git a/phpBB/phpbb/profilefields/type/type_dropdown.php b/phpBB/phpbb/profilefields/type/type_dropdown.php
index 0bf36fcbfd..95f250f444 100644
--- a/phpBB/phpbb/profilefields/type/type_dropdown.php
+++ b/phpBB/phpbb/profilefields/type/type_dropdown.php
@@ -239,4 +239,23 @@ class type_dropdown extends type_base
 
 		return parent::get_excluded_options($key, $action, $current_value, $field_data, $step);
 	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function display_options(&$template_vars, &$field_data)
+	{
+		// Initialize these array elements if we are creating a new field
+		if (!sizeof($field_data['lang_options']))
+		{
+			// No options have been defined for the dropdown menu
+			$field_data['lang_options'] = array();
+		}
+
+		$template_vars = array_merge($template_vars, array(
+			'S_DROPDOWN'				=> true,
+			'L_LANG_OPTIONS_EXPLAIN'	=> $this->user->lang['DROPDOWN_ENTRIES_EXPLAIN'],
+			'LANG_OPTIONS'				=> implode("\n", $field_data['lang_options']),
+		));
+	}
 }
diff --git a/phpBB/phpbb/profilefields/type/type_interface.php b/phpBB/phpbb/profilefields/type/type_interface.php
index 9ce975f676..e0c2ba824d 100644
--- a/phpBB/phpbb/profilefields/type/type_interface.php
+++ b/phpBB/phpbb/profilefields/type/type_interface.php
@@ -11,16 +11,6 @@ namespace phpbb\profilefields\type;
 
 interface type_interface
 {
-	/*
-	public function validate(&$value, $validation);
-
-	public function prepare_for_storage($value);
-
-	public function prepare_for_display($value);
-
-	public function prepare_for_edit($value);
-	*/
-
 	/**
 	* Get dropdown options for second step in ACP
 	*
@@ -154,4 +144,13 @@ interface type_interface
 	* @return mixed		Final value of the option
 	*/
 	public function prepare_hidden_fields($step, $key, $action, &$field_data);
+
+	/**
+	* Allows assigning of additional template variables
+	*
+	* @param array	$template_vars	Template variables we are going to assign
+	* @param array	$field_data		Array with data for this field
+	* @return null
+	*/
+	public function display_options(&$template_vars, &$field_data);
 }
diff --git a/phpBB/phpbb/profilefields/type/type_string.php b/phpBB/phpbb/profilefields/type/type_string.php
index 66157ddc20..9542a6256a 100644
--- a/phpBB/phpbb/profilefields/type/type_string.php
+++ b/phpBB/phpbb/profilefields/type/type_string.php
@@ -110,4 +110,16 @@ class type_string extends type_string_common
 
 		return $options;
 	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function display_options(&$template_vars, &$field_data)
+	{
+		$template_vars = array_merge($template_vars, array(
+			'S_STRING'					=> true,
+			'L_DEFAULT_VALUE_EXPLAIN'	=> $this->user->lang['STRING_DEFAULT_VALUE_EXPLAIN'],
+			'LANG_DEFAULT_VALUE'		=> $field_data['lang_default_value'],
+		));
+	}
 }
diff --git a/phpBB/phpbb/profilefields/type/type_text.php b/phpBB/phpbb/profilefields/type/type_text.php
index 60abb2e421..0ead505262 100644
--- a/phpBB/phpbb/profilefields/type/type_text.php
+++ b/phpBB/phpbb/profilefields/type/type_text.php
@@ -155,4 +155,16 @@ class type_text extends type_string_common
 
 		return parent::prepare_hidden_fields($step, $key, $action, $field_data);
 	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function display_options(&$template_vars, &$field_data)
+	{
+		$template_vars = array_merge($template_vars, array(
+			'S_TEXT'					=> true,
+			'L_DEFAULT_VALUE_EXPLAIN'	=> $this->user->lang['TEXT_DEFAULT_VALUE_EXPLAIN'],
+			'LANG_DEFAULT_VALUE'		=> $field_data['lang_default_value'],
+		));
+	}
 }