Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Зуев Егор
/
wiki.dev
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
Authored by
Dan Brown
2017-01-22 12:19:50 +0000
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
Commit
380f0f2042cc9efb824e19ce16912135a77d541f
380f0f20
1 parent
33d4844f
Prevented a missing avatar from crashing the application
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
2 deletions
app/User.php
app/User.php
View file @
380f0f2
...
...
@@ -160,8 +160,16 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
*/
public
function
getAvatar
(
$size
=
50
)
{
if
(
$this
->
image_id
===
0
||
$this
->
image_id
===
'0'
||
$this
->
image_id
===
null
)
return
baseUrl
(
'/user_avatar.png'
);
return
baseUrl
(
$this
->
avatar
->
getThumb
(
$size
,
$size
,
false
));
$default
=
baseUrl
(
'/user_avatar.png'
);
$imageId
=
$this
->
image_id
;
if
(
$imageId
===
0
||
$imageId
===
'0'
||
$imageId
===
null
)
return
$default
;
try
{
$avatar
=
baseUrl
(
$this
->
avatar
->
getThumb
(
$size
,
$size
,
false
));
}
catch
(
\Exception
$err
)
{
$avatar
=
$default
;
}
return
$avatar
;
}
/**
...
...
Please
register
or
sign in
to post a comment