Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into...

diff --git a/lib/noticeform.php b/lib/noticeform.php
index a36b7f31f752047e733f9d5fd41865923e283522..4e2a2edd61ff78c085d46e5c7419228e7a83a57a 100644 (file)
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -151,12 +151,12 @@ class NoticeForm extends Form
                             '140');
         $this->out->elementEnd('dl');
         if (common_config('attachments', 'uploads')) {
-            $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',
                                                'name' => 'attach',
                                                'title' => _('Attach a file')));
+            $this->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota'));
         }
         if ($this->action) {
             $this->out->hidden('notice_return-to', $this->action, 'returnto');

diff --git a/lib/rssaction.php b/lib/rssaction.php
index eafdbf131d6d00d3801adb87729e49928a024598..6f6c9a8cb08e76461b1438556de367850c39e20d 100644 (file)
--- a/lib/rssaction.php
+++ b/lib/rssaction.php
@@ -212,6 +212,10 @@ class Rss10Action extends Action
         $this->element('sioc:has_creator', array('rdf:resource' => $creator_uri.'#acct'));
         $this->element('laconica:postIcon', array('rdf:resource' => $profile->avatarUrl()));
         $this->element('cc:licence', array('rdf:resource' => common_config('license', 'url')));
+        if ($notice->reply_to) {
+            $replyurl = common_local_url('shownotice', array('notice' => $notice->reply_to));
+            $this->element('sioc:reply_to', array('rdf:resource' => $replyurl));
+        }
         $this->elementEnd('item');
         $this->creators[$creator_uri] = $profile;
     }