Merge branch '0.8.x'
This commit is contained in:
commit
bcc414bc9f
|
@ -282,7 +282,7 @@ class MailboxAction extends CurrentUserDesignAction
|
||||||
$ns->name);
|
$ns->name);
|
||||||
$this->elementEnd('span');
|
$this->elementEnd('span');
|
||||||
} else {
|
} else {
|
||||||
$this->out->element('span', 'device', $source_name);
|
$this->element('span', 'device', $source_name);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -132,8 +132,8 @@ class RealtimePlugin extends Plugin
|
||||||
|
|
||||||
// Add to the public timeline
|
// Add to the public timeline
|
||||||
|
|
||||||
if ($notice->is_local ||
|
if ($notice->is_local == Notice::LOCAL_PUBLIC ||
|
||||||
($notice->is_local == 0 && !common_config('public', 'localonly'))) {
|
($notice->is_local == Notice::REMOTE_OMB && !common_config('public', 'localonly'))) {
|
||||||
$paths[] = array('public');
|
$paths[] = array('public');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user