1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-05 16:27:38 +02:00

Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/11538] Cut functional tests down a bit as these are more expensive.
  [ticket/11538] Compare to '' instead of using empty(), so '0' does not pass.
  [ticket/11538] Add unit tests for phpbb_validate_hex_colour().
This commit is contained in:
Joas Schilling
2013-05-27 11:52:44 +02:00
3 changed files with 126 additions and 15 deletions

View File

@@ -2009,7 +2009,7 @@ function validate_jabber($jid)
*/
function phpbb_validate_hex_colour($colour, $optional = false)
{
if (empty($colour))
if ($colour === '')
{
return (($optional) ? false : 'WRONG_DATA');
}