makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11538] Rename phpbb_validate_colour to phpbb_validate_hex_colour

Browse source 
PHPBB3-11538
This commit is contained in:
Marc Alexander 2013-05-19 11:29:11 +02:00
parent 0a5988ec1f
commit b49ce5eb3a
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/acp/acp_groups.php
View file

@ -423,7 +423,7 @@ class acp_groups
} }
// Validate submitted colour value // 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 // Replace "error" string with its real, localised form
$error = array_merge($error, array_map(array(&$user, 'lang'), $colour_error)); $error = array_merge($error, array_map(array(&$user, 'lang'), $colour_error));

5
phpBB/includes/functions_user.php
View file

@ -1903,9 +1903,10 @@ function validate_jabber($jid)
* Validate hex colour value * Validate hex colour value
* *
* @param string $colour The 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)) if (empty($colour))
{ {

2
phpBB/includes/ucp/ucp_groups.php
View file

@ -596,7 +596,7 @@ class ucp_groups
} }
// Validate submitted colour value // 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 // Replace "error" string with its real, localised form
$error = array_merge($error, array_map(array(&$user, 'lang'), $colour_error)); $error = array_merge($error, array_map(array(&$user, 'lang'), $colour_error));