#7: Actually show S3 avatars on artist pages.

Poniverse · Jul 17, 2016 · 12f7ebe · 12f7ebe
1 parent 1574fde
commit 12f7ebe
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/app/models/Entity/Artist.php b/app/models/Entity/Artist.php
@@ -157,12 +157,10 @@ public static function getArtistImage($image_url)
     {
         if ($image_url)
         {
-            $file_path = DF_UPLOAD_FOLDER.DIRECTORY_SEPARATOR.$image_url;
-            if (file_exists($file_path))
-                return $image_url;
+            return $image_url;
+        } else {
+            return 'pvl_square.png';
         }
-
-        return 'pvl_square.png';
     }
 
     public static function findAbandonedByName($name)
@@ -183,4 +181,4 @@ public static function getSocialTypes()
     {
         return Podcast::getSocialTypes();
     }
-}
+}
diff --git a/app/modules/admin/controllers/ArtistsController.php b/app/modules/admin/controllers/ArtistsController.php
@@ -80,4 +80,4 @@ public function deleteAction()
         $this->alert('Record deleted.', 'green');
         $this->redirectFromHere(array('action' => 'index', 'id' => NULL, 'csrf' => NULL));
     }
-}
+}
diff --git a/app/modules/admin/views/scripts/artists/index.phtml b/app/modules/admin/views/scripts/artists/index.phtml
@@ -98,4 +98,4 @@ $title = 'Manage Artists';
     </tbody>
 </table>
 
-<?=$this->viewHelper->paginate($pager) ?>
+<?=$this->viewHelper->paginate($pager) ?>
-Original file line number
+Diff line change
@@ Expand Up / @@ -80,4 +80,4 @@ public function deleteAction() @@
             $this->alert('Record deleted.', 'green');
             $this->redirectFromHere(array('action' => 'index', 'id' => NULL, 'csrf' => NULL));
         }
-    }
+    }