Email notify-on-fave moved to Profile_prefs (run upgrade.php)

[quix0rs-gnu-social.git] / actions / attachment_thumbnail.php

diff --git a/actions/attachment_thumbnail.php b/actions/attachment_thumbnail.php
index b564dee50e890c31d2e3d9bebadd9bb2c352456f..b71ea6c801ce4c488c705d5cc630afb36e549653 100644 (file)
--- a/actions/attachment_thumbnail.php
+++ b/actions/attachment_thumbnail.php
@@ -58,7 +58,12 @@ class Attachment_thumbnailAction extends AttachmentAction
     function showPage()
     {
         // Returns a File_thumbnail object or throws exception if not available
-        $thumbnail = $this->attachment->getThumbnail($this->thumb_w, $this->thumb_h, $this->thumb_c);
+        try {
+            $thumbnail = $this->attachment->getThumbnail($this->thumb_w, $this->thumb_h, $this->thumb_c);
+        } catch (UseFileAsThumbnailException $e) {
+            // Since we're only using the ->getUrl() function, we can use the File object
+            $thumbnail = $e->file;
+        }
         common_redirect($thumbnail->getUrl());
     }
 }