AvatarSettings more aligned to FormAction

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

diff --git a/actions/attachment_thumbnail.php b/actions/attachment_thumbnail.php
index 484e5f00f273853e393da06ae6390f152c5ae80f..e8f89ffc360d45c505aefd5198e4927e9b04a8ec 100644 (file)
--- a/actions/attachment_thumbnail.php
+++ b/actions/attachment_thumbnail.php
@@ -44,18 +44,16 @@ 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;
     }
 
-    function showPage()
+    public function showPage()
     {
         // Returns a File_thumbnail object or throws exception if not available
         try {
@@ -64,6 +62,6 @@ class Attachment_thumbnailAction extends AttachmentAction
             common_redirect($e->file->getUrl());
         }
 
-        common_redirect($thumbnail->getUrl());
+        common_redirect(File_thumbnail::url($thumbnail->filename));
     }
 }