Merge in Phergie changes

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

diff --git a/lib/noticeform.php b/lib/noticeform.php
index a55839de0ba8c6f1e22f5f28cae60cd594bac7b2..84c20a5b3ff1ed13d49695113b661f74fd67f0ec 100644 (file)
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -189,14 +189,10 @@ class NoticeForm extends Form
             }
 
             if (common_config('attachments', 'uploads')) {
-                $this->out->element('label', array('id' => 'notice_data-attach-label',
-                                                   'class' => 'attach-label',
-                                                   'for' => 'notice_data-attach'),
-                                                   _('Attach'));
+                $this->out->element('label', array('for' => 'notice_data-attach'),_('Attach'));
                 $this->out->element('input', array('id' => 'notice_data-attach',
-                                                   'class' => 'attach',
                                                    'type' => 'file',
-                                                   'name' => 'attach0',
+                                                   'name' => 'attach',
                                                    'title' => _('Attach a file')));
                 $this->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota'));
             }
@@ -218,8 +214,6 @@ class NoticeForm extends Form
                 $this->out->inlineScript(' var NoticeDataGeo_text = {'.
                     'ShareDisable: ' .json_encode(_('Do not share my location')).','.
                     'ErrorTimeout: ' .json_encode(_('Sorry, retrieving your geo location is taking longer than expected, please try again later')).
-                    '} ; var NoticeAttachment_text = {'.
-                    'AttachFile: ' . json_encode(_('Attach a file')) .
                     '}');
             }