diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-05-27 11:52:44 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-05-27 11:52:44 +0200 |
| commit | 00326517291fc093e87e9bbeeeb923ae0f373414 (patch) | |
| tree | 4f57f17c19e6c1e7aa5ac37f016c0ce4fc70a6ed /phpBB/includes/functions_user.php | |
| parent | 06379aece8dccdfddfdf2255b12edf5e9df772ec (diff) | |
| parent | f77111fe0e2f590898bea89ec771ba87aeceee6e (diff) | |
| download | forums-00326517291fc093e87e9bbeeeb923ae0f373414.tar forums-00326517291fc093e87e9bbeeeb923ae0f373414.tar.gz forums-00326517291fc093e87e9bbeeeb923ae0f373414.tar.bz2 forums-00326517291fc093e87e9bbeeeb923ae0f373414.tar.xz forums-00326517291fc093e87e9bbeeeb923ae0f373414.zip | |
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().
Diffstat (limited to 'phpBB/includes/functions_user.php')
| -rw-r--r-- | phpBB/includes/functions_user.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 9a2ad4c25f..93a7c09107 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -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'); } |