From 91a3cb84cd842ce6ff0f4834327a2f162cfa6af4 Mon Sep 17 00:00:00 2001 From: Mike Cochrane Date: Sun, 20 Jul 2008 05:49:54 -0400 Subject: [PATCH] Clean up of delete links when not logged in darcs-hash:20080720094954-533db-1096bf464e37a9c380afc15ac1b33b1f2f43cf91.gz --- lib/stream.php | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/lib/stream.php b/lib/stream.php index 490a2739b3..1dd4c55e79 100644 --- a/lib/stream.php +++ b/lib/stream.php @@ -63,10 +63,12 @@ class StreamAction extends Action { function show_notice($notice) { global $config; $profile = $notice->getProfile(); - if (common_logged_in()) { - $user = common_current_user(); - $user_profile = $user->getProfile(); - } + if (common_logged_in()) { + $user = common_current_user(); + $user_profile = $user->getProfile(); + } else { + $user_profile = false; + } # XXX: RDFa common_element_start('li', array('class' => 'notice_single', @@ -118,12 +120,12 @@ class StreamAction extends Action { common_raw('→'); common_element_end('a'); common_element_end('p'); - if ($notice->profile_id == $user_profile->id) { - $deleteurl = common_local_url('deletenotice', array('notice' => $notice->id)); - common_element('a', array('class' => 'deletenotice', - 'href' => $deleteurl), - _('delete')); - } + if ($user_profile && $notice->profile_id == $user_profile->id) { + $deleteurl = common_local_url('deletenotice', array('notice' => $notice->id)); + common_element('a', array('class' => 'deletenotice', + 'href' => $deleteurl), + _('delete')); + } common_element_end('li'); } }