AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed PHP warning when removing a user with no Avatar image

Browse Source
This commit is contained in:
Frederic Guillot
2016-05-05 21:36:43 -04:00
parent 6b78b882d8
commit ab56d9aff2
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Model/AvatarFile.php
View File

@@ -60,14 +60,18 @@ class AvatarFile extends Base
public function remove($user_id)
{
try {
$this->objectStorage->remove($this->getFilename($user_id));
$result = $this->db->table(User::TABLE)->eq('id', $user_id)->update(array('avatar_path' => ''));
$this->userSession->refresh($user_id);
return $result;
$filename = $this->getFilename($user_id);
if (! empty($filename)) {
$this->objectStorage->remove($filename);
return $this->db->table(User::TABLE)->eq('id', $user_id)->update(array('avatar_path' => ''));
}
} catch (Exception $e) {
$this->logger->error($e->getMessage());
return false;
}
return true;
}
/**