Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
This commit is contained in:
commit
29bebdb50b
|
@ -151,12 +151,12 @@ class NoticeForm extends Form
|
||||||
'140');
|
'140');
|
||||||
$this->out->elementEnd('dl');
|
$this->out->elementEnd('dl');
|
||||||
if (common_config('attachments', 'uploads')) {
|
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('label', array('for' => 'notice_data-attach'),_('Attach'));
|
||||||
$this->out->element('input', array('id' => 'notice_data-attach',
|
$this->out->element('input', array('id' => 'notice_data-attach',
|
||||||
'type' => 'file',
|
'type' => 'file',
|
||||||
'name' => 'attach',
|
'name' => 'attach',
|
||||||
'title' => _('Attach a file')));
|
'title' => _('Attach a file')));
|
||||||
|
$this->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota'));
|
||||||
}
|
}
|
||||||
if ($this->action) {
|
if ($this->action) {
|
||||||
$this->out->hidden('notice_return-to', $this->action, 'returnto');
|
$this->out->hidden('notice_return-to', $this->action, 'returnto');
|
||||||
|
|
|
@ -212,6 +212,10 @@ class Rss10Action extends Action
|
||||||
$this->element('sioc:has_creator', array('rdf:resource' => $creator_uri.'#acct'));
|
$this->element('sioc:has_creator', array('rdf:resource' => $creator_uri.'#acct'));
|
||||||
$this->element('laconica:postIcon', array('rdf:resource' => $profile->avatarUrl()));
|
$this->element('laconica:postIcon', array('rdf:resource' => $profile->avatarUrl()));
|
||||||
$this->element('cc:licence', array('rdf:resource' => common_config('license', 'url')));
|
$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->elementEnd('item');
|
||||||
$this->creators[$creator_uri] = $profile;
|
$this->creators[$creator_uri] = $profile;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user