wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '0.8.x'

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/mailbox.php
View File

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

4
plugins/Realtime/RealtimePlugin.php
View File

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