Merge branch 'master' into FeedPoller

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

diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php
index cf7c9acc147fe8ab24ddc0c525f5b6c5a43fff16..c0c45a1dbb2fdea7c2964bda3db5cecb8f9b2613 100644 (file)
--- a/lib/attachmentlist.php
+++ b/lib/attachmentlist.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
+if (!defined('GNUSOCIAL') && !defined('STATUSNET')) {
     exit(1);
 }
 
@@ -67,16 +67,16 @@ class AttachmentList extends Widget
     }
 
     /**
-     * show the list of notices
+     * show the list of attachments
      *
      * "Uses up" the stream by looping through it. So, probably can't
      * be called twice on the same list.
      *
-     * @return int count of notices listed.
+     * @return int count of items listed.
      */
     function show()
     {
-        $att = File::getAttachments($this->notice->id);
+       $att = $this->notice->attachments();
         if (empty($att)) return 0;
         $this->showListStart();
 
@@ -101,16 +101,13 @@ class AttachmentList extends Widget
     }
 
     /**
-     * returns a new list item for the current notice
+     * returns a new list item for the current attachment
      *
-     * Recipe (factory?) method; overridden by sub-classes to give
-     * a different list item class.
+     * @param File $attachment the current attachment
      *
-     * @param Notice $notice the current notice
-     *
-     * @return NoticeListItem a list item for displaying the notice
+     * @return AttachmentListItem a list item for displaying the attachment
      */
-    function newListItem($attachment)
+    function newListItem(File $attachment)
     {
         return new AttachmentListItem($attachment, $this->out);
     }
@@ -142,17 +139,13 @@ class AttachmentListItem extends Widget
     var $oembed = null;
 
     /**
-     * constructor
-     *
-     * Also initializes the profile attribute.
-     *
-     * @param Notice $notice The notice we'll display
+     * @param File $attachment the attachment we will display
      */
-    function __construct($attachment, $out=null)
+    function __construct(File $attachment, $out=null)
     {
         parent::__construct($out);
         $this->attachment  = $attachment;
-        $this->oembed = File_oembed::staticGet('file_id', $this->attachment->id);
+        $this->oembed = File_oembed::getKV('file_id', $this->attachment->id);
     }
 
     function title() {
@@ -222,7 +215,7 @@ class AttachmentListItem extends Widget
      */
     function getThumbInfo()
     {
-        $thumbnail = File_thumbnail::staticGet('file_id', $this->attachment->id);
+        $thumbnail = File_thumbnail::getKV('file_id', $this->attachment->id);
         if ($thumbnail) {
             $maxWidth = common_config('attachments', 'thumb_width');
             $maxHeight = common_config('attachments', 'thumb_height');