Merge branch 'develop'

jung35 · Oct 30, 2015 · b87e85a · b87e85a
2 parents f48e683 + 8d95f9c
commit b87e85a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/app/Models/Profile.php b/app/Models/Profile.php
@@ -118,6 +118,11 @@ public function getLastAddedAtAttribute($lastAddedAt)
 		return (new Carbon($lastAddedAt))->format("M j Y");
 	}
 
+	public function getTotalAttribute($total)
+	{
+		return is_numeric($total) ? $total : 0;
+	}
+
 	public function isPrivate()
 	{
 		return $this->privacy != 3;

diff --git a/app/Steam/SteamAPI.php b/app/Steam/SteamAPI.php
@@ -1,6 +1,5 @@
 <?php namespace VacStatus\Steam;
 
-use VacStatus\Steam\Steam;
 use Cache;
 use Carbon;
 

diff --git a/app/Update/MultiProfile.php b/app/Update/MultiProfile.php
@@ -351,7 +351,7 @@ private function updateUsingAPI()
 
 				if($this->customList)
 				{
-					if(isset($userListProfile->profile_name))
+					if(isset($userListProfile->profile_name) && !empty($userListProfile->profile_name))
 					{
 						$return['display_name'] = $userListProfile->profile_name;
 					}