summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederic Guillot <fred@kanboard.net>2016-06-29 21:45:28 -0400
committerFrederic Guillot <fred@kanboard.net>2016-06-29 21:45:28 -0400
commit1aab14212729c561244196de30243fe920dd0d8b (patch)
tree8d858cd0ab06e459fa214979dcc72798401867de
parent6c24ec578470ef9aa788c8c879ab689814ab22be (diff)
Fixed identical background color for LetterAvatar on 32bits platforms
-rw-r--r--ChangeLog1
-rw-r--r--app/User/Avatar/LetterAvatarProvider.php2
-rw-r--r--tests/units/User/Avatar/LetterAvatarProviderTest.php2
3 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f135746d..3ea3f2c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,7 @@ Improvements:
Bug fixes:
* Fixed broken CSV exports
+* Fixed identical background color for LetterAvatar on 32bits platforms (Hash greater than PHP_MAX_INT)
Version 1.0.30
--------------
diff --git a/app/User/Avatar/LetterAvatarProvider.php b/app/User/Avatar/LetterAvatarProvider.php
index b7a95f41..727f9109 100644
--- a/app/User/Avatar/LetterAvatarProvider.php
+++ b/app/User/Avatar/LetterAvatarProvider.php
@@ -142,7 +142,7 @@ class LetterAvatarProvider extends Base implements AvatarProviderInterface
// Make hash more sensitive for short string like 'a', 'b', 'c'
$str .= 'x';
- $max = intval(9007199254740991 / $seed2);
+ $max = intval(PHP_INT_MAX / $seed2);
for ($i = 0, $ilen = mb_strlen($str, 'UTF-8'); $i < $ilen; $i++) {
if ($hash > $max) {
diff --git a/tests/units/User/Avatar/LetterAvatarProviderTest.php b/tests/units/User/Avatar/LetterAvatarProviderTest.php
index 0eb3ef8e..c145967b 100644
--- a/tests/units/User/Avatar/LetterAvatarProviderTest.php
+++ b/tests/units/User/Avatar/LetterAvatarProviderTest.php
@@ -23,7 +23,7 @@ class LetterAvatarProviderTest extends Base
{
$provider = new LetterAvatarProvider($this->container);
$user = array('id' => 123, 'name' => 'Kanboard Admin', 'username' => 'bob', 'email' => '');
- $expected = '<div class="avatar-letter" style="background-color: rgb(131, 224, 108)" title="Kanboard Admin">KA</div>';
+ $expected = '<div class="avatar-letter" style="background-color: rgb(120, 83, 58)" title="Kanboard Admin">KA</div>';
$this->assertEquals($expected, $provider->render($user, 48));
}