Merge branch 'genericons-fix' into 'nightly'

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

diff --git a/actions/attachment.php b/actions/attachment.php
index 1126759832a65799744a29c67c6c257d80a8ddb5..3f2ae5c1ce0f89aa7081653b850d8090480aafb6 100644 (file)
--- a/actions/attachment.php
+++ b/actions/attachment.php
@@ -96,7 +96,7 @@ class AttachmentAction extends ManagedAction
     {
         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::showPage();
@@ -132,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();
-        }
     }
 }