Skip to content

Commit a58fb81

Browse files
authored
Update DynamicAvatar.php (#12)
PHP 8.4 compatibility
1 parent f5a3345 commit a58fb81

File tree

1 file changed

+8
-13
lines changed

1 file changed

+8
-13
lines changed

Helper/DynamicAvatar.php

+8-13
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
class DynamicAvatar extends AvatarHelper
1414
{
1515

16-
public function dynamicRender($user_id, $username, $name, $email, $avatar_path, $css = 'avatar-left', $size = 48)
16+
public function dynamicRender($user_id, $username, $name, $email, $avatar_path, $size = 48, $css = 'avatar-left')
1717
{
1818
if (empty($user_id) && empty($username)) {
1919
$html = $this->avatarManager->renderDefault($size);
@@ -23,18 +23,18 @@ public function dynamicRender($user_id, $username, $name, $email, $avatar_path,
2323
return '<div id="'.$css.'" class="avatar avatar-dyn '.$css.'">'.$html.'</div>';
2424
}
2525

26-
public function dynamic($user_id, $username, $name, $email, $avatar_path, $css = '', $size)
26+
public function dynamic($user_id, $username, $name, $email, $avatar_path, $size, $css = '')
2727
{
28-
return $this->dynamicRender($user_id, $username, $name, $email, $avatar_path, $css, $size);
28+
return $this->dynamicRender($user_id, $username, $name, $email, $avatar_path, $size, $css);
2929
}
3030

3131
public function currentUserDynamic($css = '')
3232
{
3333
$user = $this->userSession->getAll();
34-
return $this->dynamic($user['id'], $user['username'], $user['name'], $user['email'], $user['avatar_path'], $css, $this->configModel->get('av_size', '20'));
34+
return $this->dynamic($user['id'], $user['username'], $user['name'], $user['email'], $user['avatar_path'], $this->configModel->get('av_size', '20'), $css);
3535
}
3636

37-
public function boardDynamicRender($user_id, $username, $name, $email, $avatar_path, $css = 'avatar-left', $size = 48)
37+
public function boardDynamicRender($user_id, $username, $name, $email, $avatar_path, $size = 48, $css = 'avatar-left')
3838
{
3939
if (empty($user_id) && empty($username)) {
4040
$html = $this->avatarManager->renderDefault($size);
@@ -44,20 +44,15 @@ public function boardDynamicRender($user_id, $username, $name, $email, $avatar_p
4444
return '<div id="'.$css.'" class="avatar avatar-bdyn '.$css.'">'.$html.'</div>';
4545
}
4646

47-
public function boardDynamic($user_id, $username, $name, $email, $avatar_path, $css = '', $size)
47+
public function boardDynamic($user_id, $username, $name, $email, $avatar_path, $size, $css = '')
4848
{
49-
return $this->boardDynamicRender($user_id, $username, $name, $email, $avatar_path, $css, $size);
49+
return $this->boardDynamicRender($user_id, $username, $name, $email, $avatar_path, $size, $css);
5050
}
5151

5252
public function boardCurrentUserDynamic($css = '')
5353
{
5454
$user = $this->userSession->getAll();
55-
return $this->boardDynamic($user['id'], $user['username'], $user['name'], $user['email'], $user['avatar_path'], $css, $this->configModel->get('b_av_size', '20'));
56-
}
57-
58-
public function getUser()
59-
{
60-
return $this->userSession->getAll();
55+
return $this->boardDynamic($user['id'], $user['username'], $user['name'], $user['email'], $user['avatar_path'], $this->configModel->get('b_av_size', '20'), $css);
6156
}
6257

6358
}

0 commit comments

Comments
 (0)