Merge branch '0.8.x'

This commit is contained in:
Zach Copley 2009-11-16 21:49:51 +00:00
commit bcc414bc9f
2 changed files with 3 additions and 3 deletions

View File

@ -282,7 +282,7 @@ class MailboxAction extends CurrentUserDesignAction
$ns->name);
$this->elementEnd('span');
} else {
$this->out->element('span', 'device', $source_name);
$this->element('span', 'device', $source_name);
}
break;
}

View File

@ -132,8 +132,8 @@ class RealtimePlugin extends Plugin
// Add to the public timeline
if ($notice->is_local ||
($notice->is_local == 0 && !common_config('public', 'localonly'))) {
if ($notice->is_local == Notice::LOCAL_PUBLIC ||
($notice->is_local == Notice::REMOTE_OMB && !common_config('public', 'localonly'))) {
$paths[] = array('public');
}