diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-05-27 11:51:26 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-05-27 11:51:26 +0200 |
| commit | f77111fe0e2f590898bea89ec771ba87aeceee6e (patch) | |
| tree | 897e2c9291ec1d9a760b9bf479e410e3d53e0bc8 /phpBB | |
| parent | 2b356e766f8d0f3e9dfc2d1fdd6bc857fdb63497 (diff) | |
| parent | 3faae5c98cfe9d3b6245a892808aee19bc9c1fcc (diff) | |
| download | forums-f77111fe0e2f590898bea89ec771ba87aeceee6e.tar forums-f77111fe0e2f590898bea89ec771ba87aeceee6e.tar.gz forums-f77111fe0e2f590898bea89ec771ba87aeceee6e.tar.bz2 forums-f77111fe0e2f590898bea89ec771ba87aeceee6e.tar.xz forums-f77111fe0e2f590898bea89ec771ba87aeceee6e.zip | |
Merge remote-tracking branch 'remotes/bantu/ticket/11538' into develop-olympus
* remotes/bantu/ticket/11538:
[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')
| -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 61972c3876..6b6a9b1f9f 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -1910,7 +1910,7 @@ function validate_jabber($jid) */ function phpbb_validate_hex_colour($colour, $optional = false) { - if (empty($colour)) + if ($colour === '') { return (($optional) ? false : 'WRONG_DATA'); } |