Merge branch 'fixes/private_scope_on_tags' into social-master

[quix0rs-gnu-social.git] / lib / attachmentnoticesection.php

diff --git a/lib/attachmentnoticesection.php b/lib/attachmentnoticesection.php
index 127fe5824e5117e2cb61292c285f0afffb2f47ab..7a22bd0e9d271cb626d26e3af734bebff3c1d941 100644 (file)
--- a/lib/attachmentnoticesection.php
+++ b/lib/attachmentnoticesection.php
@@ -21,13 +21,13 @@
  *
  * @category  Widget
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -38,11 +38,10 @@ if (!defined('LACONICA')) {
  *
  * @category Widget
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class AttachmentNoticeSection extends NoticeSection
 {
     function showContent() {
@@ -53,23 +52,24 @@ class AttachmentNoticeSection extends NoticeSection
     function getNotices()
     {
         $notice = new Notice;
-        $f2p = new File_to_post;
-        $f2p->file_id = $this->out->attachment->id;
-        $notice->joinAdd($f2p);
+
+        $notice->joinAdd(array('id', 'file_to_post:post_id'));
+        $notice->whereAdd(sprintf('file_to_post.file_id = %d', $this->out->attachment->id));
+
         $notice->orderBy('created desc');
         $notice->selectAdd('post_id as id');
         $notice->find();
-        return $notice; 
+        return $notice;
     }
 
     function title()
     {
+        // TRANS: Title.
         return _('Notices where this attachment appears');
     }
 
     function divId()
     {
-        return 'popular_notices';
+        return 'attachment_section';
     }
 }
-