diff options
| -rw-r--r-- | classes/Notice.php | 10 | ||||
| -rw-r--r-- | lib/noticeform.php | 2 | ||||
| -rw-r--r-- | lib/noticelist.php | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/classes/Notice.php b/classes/Notice.php index 45ea72823..1c4858149 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -276,13 +276,15 @@ class Notice extends Memcached_DataObject function getUploadedAttachment() { $post = clone $this; - $query = 'select file.url as uploaded from file join file_to_post on file.id = file_id where post_id=' . $post->escape($post->id) . ' and url like "%/notice/%/file"'; + $query = 'select file.url as up, file.id as i from file join file_to_post on file.id = file_id where post_id=' . $post->escape($post->id) . ' and url like "%/notice/%/file"'; $post->query($query); $post->fetch(); - $ret = $post->uploaded; -// var_dump($post); + if (empty($post->up) || empty($post->i)) { + $ret = false; + } else { + $ret = array($post->up, $post->i); + } $post->free(); -// die(); return $ret; } diff --git a/lib/noticeform.php b/lib/noticeform.php index 5d7cf194e..3212f382a 100644 --- a/lib/noticeform.php +++ b/lib/noticeform.php @@ -148,6 +148,7 @@ class NoticeForm extends Form $this->out->element('dd', array('id' => 'notice_text-count'), '140'); $this->out->elementEnd('dl'); + $this->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota')); $this->out->element('label', array('for' => 'notice_data-attach'), _('Attach')); $this->out->element('input', array('id' => 'notice_data-attach', 'type' => 'file', @@ -157,7 +158,6 @@ class NoticeForm extends Form $this->out->hidden('notice_return-to', $this->action, 'returnto'); } $this->out->hidden('notice_in-reply-to', $this->action, 'inreplyto'); - $this->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota')); } /** diff --git a/lib/noticelist.php b/lib/noticelist.php index 9ace341d8..fadc238a4 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -366,7 +366,7 @@ class NoticeListItem extends Widget } $uploaded = $this->notice->getUploadedAttachment(); if ($uploaded) { - $this->out->element('a', array('href' => $uploaded, 'class' => 'attachment'), $uploaded); + $this->out->element('a', array('href' => $uploaded[0], 'class' => 'attachment', 'id' => 'attachment-' . $uploaded[1]), $uploaded[0]); } $this->out->elementEnd('p'); } |