Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

This commit is contained in:
Sarven Capadisli 2009-11-01 21:19:11 +01:00
commit 01dd745a9c

View File

@ -224,15 +224,14 @@ class NewmessageAction extends Action
$this->msg = $msg; $this->msg = $msg;
if ($this->trimmed('ajax')) { if ($this->trimmed('ajax')) {
$this->startHTML('text/xml;charset=UTF-8'); header('Content-Type: text/xml;charset=utf-8');
$this->xw->startDocument('1.0', 'UTF-8');
$this->elementStart('html');
$this->elementStart('head'); $this->elementStart('head');
$this->element('title', null, _('New message')); $this->element('title', null, _('New message'));
$this->elementEnd('head'); $this->elementEnd('head');
$this->elementStart('body'); $this->elementStart('body');
if (common_logged_in()) { $this->showNoticeForm();
$this->showNoticeForm();
}
$this->elementEnd('div');
$this->elementEnd('body'); $this->elementEnd('body');
$this->endHTML(); $this->endHTML();
} }