浏览代码

Update Profile model, improve #381

Daniel Supernault 6 年之前
父节点
当前提交
2e8fb762ae
共有 1 个文件被更改,包括 5 次插入3 次删除
  1. 5 3
      app/Profile.php

+ 5 - 3
app/Profile.php

@@ -125,14 +125,16 @@ class Profile extends Model
 
     public function avatar()
     {
-        return $this->hasOne(Avatar::class);
+        return $this->hasOne(Avatar::class)->withDefault([
+            'media_path' => 'public/avatars/default.png'
+        ]);
     }
 
     public function avatarUrl()
     {
         $url = Cache::remember("avatar:{$this->id}", 1440, function() {
-            $path = $this->avatar->media_path ?? 'public/avatars/default.png';
-            $version = $this->avatar ? hash('sha1', $this->avatar->created_at) : '';
+            $path = optional($this->avatar)->media_path;
+            $version = hash('sha1', $this->avatar->created_at);
             $path = "{$path}?v={$version}";
             return url(Storage::url($path));
         });