diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-05-19 11:29:11 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-05-19 11:29:11 +0200 |
| commit | b49ce5eb3a54a6c256955d3510fe409a6f4511aa (patch) | |
| tree | 33c60d3e9d95f85284c79976ce9998956626e68c | |
| parent | 0a5988ec1f3d72afb17b87d6cd74f60b646bae42 (diff) | |
| download | forums-b49ce5eb3a54a6c256955d3510fe409a6f4511aa.tar forums-b49ce5eb3a54a6c256955d3510fe409a6f4511aa.tar.gz forums-b49ce5eb3a54a6c256955d3510fe409a6f4511aa.tar.bz2 forums-b49ce5eb3a54a6c256955d3510fe409a6f4511aa.tar.xz forums-b49ce5eb3a54a6c256955d3510fe409a6f4511aa.zip | |
[ticket/11538] Rename phpbb_validate_colour to phpbb_validate_hex_colour
PHPBB3-11538
| -rw-r--r-- | phpBB/includes/acp/acp_groups.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions_user.php | 5 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_groups.php | 2 |
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)); |