Merge commit 'refs/merge-requests/169' of git://gitorious.org/statusnet/mainline...

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

diff --git a/actions/attachment.php b/actions/attachment.php
index 6981354d10546262c85c8f7f00bf19376b87058e..f149ca19d987978e4067bf6497431860e0071c74 100644 (file)
--- a/actions/attachment.php
+++ b/actions/attachment.php
@@ -42,7 +42,6 @@ require_once INSTALLDIR.'/lib/attachmentlist.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class AttachmentAction extends Action
 {
     /**
@@ -70,6 +69,7 @@ class AttachmentAction extends Action
         }
 
         if (empty($this->attachment)) {
+            // TRANS: Client error displayed trying to get a non-existing attachment.
             $this->clientError(_('No such attachment.'), 404);
             return false;
         }
@@ -81,7 +81,6 @@ class AttachmentAction extends Action
      *
      * @return boolean true
      */
-
     function isReadOnly($args)
     {
         return true;
@@ -129,7 +128,6 @@ class AttachmentAction extends Action
      *
      * @return void
      */
-
     function handle($args)
     {
         parent::handle($args);
@@ -145,16 +143,6 @@ class AttachmentAction extends Action
         }
     }
 
-    /**
-     * Don't show local navigation
-     *
-     * @return void
-     */
-
-    function showLocalNavBlock()
-    {
-    }
-
     /**
      * Fill the content area of the page
      *
@@ -162,7 +150,6 @@ class AttachmentAction extends Action
      *
      * @return void
      */
-
     function showContent()
     {
         $ali = new Attachment($this->attachment, $this);
@@ -174,7 +161,6 @@ class AttachmentAction extends Action
      *
      * @return void
      */
-
     function showPageNoticeBlock()
     {
     }
@@ -187,8 +173,9 @@ class AttachmentAction extends Action
     function showSections() {
         $ns = new AttachmentNoticeSection($this);
         $ns->show();
-        $atcs = new AttachmentTagCloudSection($this);
-        $atcs->show();
+        if (!common_config('performance', 'high')) {
+            $atcs = new AttachmentTagCloudSection($this);
+            $atcs->show();
+        }
     }
 }
-