Merge branch 'master' into lars-chat

This commit is contained in:
Lars van Hijfte
2017-01-24 14:26:48 +01:00
13 changed files with 224 additions and 90 deletions

View File

@@ -8,7 +8,7 @@ function selectAllFriends($userID) {
LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 20) as `name`,
IFNULL(
`profilepicture`,
'../img/notbad.jpg'
'../img/avatar-standard.png'
) AS profilepicture,
`onlinestatus`,
`role`
@@ -40,7 +40,7 @@ function selectAllFriendRequests() {
LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 20) as `name`,
IFNULL(
`profilepicture`,
'../img/notbad.jpg'
'../img/avatar-standard.png'
) AS profilepicture,
`onlinestatus`,
`role`