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 0353fa18ff7d1e165923942e9c0ad80d1a3c288d..b71ea6c801ce4c488c705d5cc630afb36e549653 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
@@ -55,30 +55,15 @@ class Attachment_thumbnailAction extends AttachmentAction
         return true;
     }
 
-    /**
-     * Show page, a template method.
-     *
-     * @return nothing
-     */
     function showPage()
-    {
-        if (Event::handle('StartShowBody', array($this))) {
-            $this->showCore();
-            Event::handle('EndShowBody', array($this));
-        }
-    }
-
-    /**
-     * Show core.
-     *
-     * Shows local navigation, content block and aside.
-     *
-     * @return nothing
-     */
-    function showCore()
     {
         // Returns a File_thumbnail object or throws exception if not available
-        $thumbnail = $this->attachment->getThumbnail($this->thumb_w, $this->thumb_h, $this->thumb_c);
-        $this->element('img', array('src' => $thumbnail->getUrl(), 'alt' => 'Thumbnail'));
+        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());
     }
 }