We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit bd70caac authored by Robin Millette's avatar Robin Millette

Only show number of attachments if > 1

parent 8c2473a2
......@@ -207,14 +207,12 @@ class NoticeListItem extends Widget
return 'shownotice' !== $this->out->args['action'];
}
function attachmentCount() {
$f2p = new File_to_post;
$f2p->post_id = $this->notice->id;
$file = new File;
$file->joinAdd($f2p);
$file->selectAdd();
$file->selectAdd('file.id as id');
return $file->find(true);
function attachmentCount($discriminant = true) {
$file_oembed = new File_oembed;
$query = "select count(*) as c from file_oembed join file_to_post on file_oembed.file_id = file_to_post.file_id where post_id=" . $this->notice->id;
$file_oembed->query($query);
$file_oembed->fetch();
return intval($file_oembed->c);
}
function showNoticeAttachmentsIcon()
......@@ -224,7 +222,6 @@ class NoticeListItem extends Widget
}
$href = common_local_url('shownotice', array('notice' => $this->notice->id)) . '#attachments';
$this->out->elementStart('p', 'entry-attachments');
$this->out->element('a', array('href' => $href, 'title' => "# of attachments: $count"), $count === 1 ? '' : $count);
$this->out->elementEnd('p');
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment