summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-06-20 21:32:27 -0700
committerEvan Prodromou <evan@controlyourself.ca>2009-06-20 21:32:27 -0700
commit29bebdb50bf008a02e6c3e9530b3dff3bdd2b821 (patch)
tree10523c07d9cb10dcda20b41ce45046a6afb42876
parentaec6456c9181ea97e11eb74c5eaf868c2406bebb (diff)
parent054e4459b2b2701158cd183dc1eb04c454e04bff (diff)
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
-rw-r--r--lib/noticeform.php2
-rw-r--r--lib/rssaction.php4
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/noticeform.php b/lib/noticeform.php
index a36b7f31f..4e2a2edd6 100644
--- 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 eafdbf131..6f6c9a8cb 100644
--- 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;
}