3 files changed, 5 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 9a9a723605..25df9e357e 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -423,7 +423,7 @@ class acp_groups
 					}
 
 					// Validate submitted colour value
-					if ($colour_error = validate_data($submit_ary, array('colour'	=> array('colour'))))
+					if ($colour_error = validate_data($submit_ary, array('colour'	=> array('hex_colour'))))
 					{
 						// Replace "error" string with its real, localised form
 						$error = array_merge($error, array_map(array(&$user, 'lang'), $colour_error));
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index b7fdb7a6ad..f8e1fcaa45 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -1903,9 +1903,10 @@ function validate_jabber($jid)
 * Validate hex colour value
 *
 * @param string $colour The hex colour value
-* @return bool/string Error message if colour value is incorrect, false if it fits the hex colour code
+* @return bool|string 	Error message if colour value is incorrect, false if it
+*			fits the hex colour code
 */
-function phpbb_validate_colour($colour)
+function phpbb_validate_hex_colour($colour)
 {
 	if (empty($colour))
 	{
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index 9d2cf2728d..20a55d8c32 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -596,7 +596,7 @@ class ucp_groups
 							}
 
 							// Validate submitted colour value
-							if ($colour_error = validate_data($submit_ary, array('colour'	=> array('colour'))))
+							if ($colour_error = validate_data($submit_ary, array('colour'	=> array('hex_colour'))))
 							{
 								// Replace "error" string with its real, localised form
 								$error = array_merge($error, array_map(array(&$user, 'lang'), $colour_error));