GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

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

This commit is contained in:
Evan Prodromou 2009-06-20 21:32:27 -07:00
parent aec6456c91 054e4459b2
commit 29bebdb50b
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/noticeform.php
View File

@ -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');

4
lib/rssaction.php
View File

@ -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;
}