Merge branch 'fixes/private_scope_on_tags' into social-master

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

diff --git a/actions/attachment_thumbnail.php b/actions/attachment_thumbnail.php
index b5173efa771dfca0969e4d118be7dee24b836d04..c85029dcf609e871a57b4c5d72bfcc929b4e4284 100644 (file)
--- a/actions/attachment_thumbnail.php
+++ b/actions/attachment_thumbnail.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('GNUSOCIAL') && !defined('STATUSNET')) { exit(1); }
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Show notice attachments
@@ -44,26 +44,24 @@ class Attachment_thumbnailAction extends AttachmentAction
     protected $thumb_h = null;  // max height
     protected $thumb_c = null;  // crop?
 
-    protected function prepare(array $args=array())
+    protected function doPreparation()
     {
-        parent::prepare($args);
+        parent::doPreparation();
 
         $this->thumb_w = $this->int('w');
         $this->thumb_h = $this->int('h');
         $this->thumb_c = $this->boolean('c');
-
-        return true;
     }
 
-    /**
-     * Show page, a template method.
-     *
-     * @return nothing
-     */
-    function showPage()
+    public 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) {
+            common_redirect($e->file->getUrl());
+        }
+
         common_redirect($thumbnail->getUrl());
     }
 }