From 3bf1024771537b4499ffbf8e2e7c25be30cc204d Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Sat, 14 Nov 2009 13:14:20 -0800 Subject: [PATCH 1/2] Fix regression from ba199ad4ec47e6b0c067a3b2a15882d3836ea009: typo in refactoring caused fatal error on unrecognized message source Example report from live site: http://identi.ca/notice/14629110 --- lib/mailbox.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mailbox.php b/lib/mailbox.php index e1d384a063..90a58b4c48 100644 --- a/lib/mailbox.php +++ b/lib/mailbox.php @@ -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; } From e4d191334f5b2e40a4cd97e1c23677d4712b7700 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Mon, 16 Nov 2009 16:19:27 -0500 Subject: [PATCH 2/2] Only show local notices or (remote notices if they're supposed to be shown) --- plugins/Realtime/RealtimePlugin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php index 0f0d0f9f42..a21c33b103 100644 --- a/plugins/Realtime/RealtimePlugin.php +++ b/plugins/Realtime/RealtimePlugin.php @@ -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'); }