Merge branch 'genericons-fix' into 'nightly'

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

diff --git a/actions/attachment.php b/actions/attachment.php
index 94ccf098e0b09e97388bb8b6e66d6dfeb5b61311..3f2ae5c1ce0f89aa7081653b850d8090480aafb6 100644 (file)
--- a/actions/attachment.php
+++ b/actions/attachment.php
@@ -92,21 +92,14 @@ class AttachmentAction extends ManagedAction
         return $a->title();
     }
 
-    /**
-     * Handle input
-     *
-     * Only handles get, so just show the page.
-     *
-     * @return void
-     */
-    protected function handle()
+    public function showPage()
     {
         if (empty($this->attachment->filename)) {
             // if it's not a local file, gtfo
-            common_redirect($this->attachment->url, 303);
+            common_redirect($this->attachment->getUrl(), 303);
         }
 
-        parent::handle();
+        parent::showPage();
     }
 
     /**
@@ -139,9 +132,5 @@ class AttachmentAction extends ManagedAction
     function showSections() {
         $ns = new AttachmentNoticeSection($this);
         $ns->show();
-        if (!common_config('performance', 'high')) {
-            $atcs = new AttachmentTagCloudSection($this);
-            $atcs->show();
-        }
     }
 }