From 716eff3955cbe4c8c79bd1884922465494bdf6cb Mon Sep 17 00:00:00 2001
From: Peter Deltchev <peter@deltchev.com>
Date: Sat, 28 May 2016 12:53:18 -0700
Subject: [PATCH] Fixed a bad query.

---
 app/Models/Album.php | 3 +--
 app/Models/Track.php | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/Models/Album.php b/app/Models/Album.php
index e8525478..2bad1246 100644
--- a/app/Models/Album.php
+++ b/app/Models/Album.php
@@ -88,8 +88,7 @@ class Album extends Model implements Searchable, Commentable, Favouritable
                 'users' => function($query) {
                     $query->whereUserId(Auth::user()->id);
                 }
-            ])
-            ->with('users.avatar');
+            ]);
         }
 
         return !$query;
diff --git a/app/Models/Track.php b/app/Models/Track.php
index c589ad26..48fe6295 100644
--- a/app/Models/Track.php
+++ b/app/Models/Track.php
@@ -263,6 +263,7 @@ class Track extends Model implements Searchable, Commentable, Favouritable
 
     /**
      * @param integer $count
+     * @return array
      */
     public static function popular($count, $allowExplicit = false)
     {
@@ -562,7 +563,6 @@ class Track extends Model implements Searchable, Commentable, Favouritable
      */
     public function getFilesize($formatName)
     {
-//        $trackFile = $this->trackFiles()->where('format', $formatName)->first();
         $trackFile = $this->trackFiles->where('format', $formatName)->first();
 
         if ($trackFile) {
@@ -681,7 +681,9 @@ class Track extends Model implements Searchable, Commentable, Favouritable
     }
 
     /**
+     * @param $format
      * @return string
+     * @throws Exception
      */
     public function getFileFor($format)
     {