summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Cochrane <mikec@mikenz.geek.nz>2008-07-20 08:27:15 -0400
committerMike Cochrane <mikec@mikenz.geek.nz>2008-07-20 08:27:15 -0400
commit26f6c917a7fd3fd5a4d7daf5ebda12b80b3c6a98 (patch)
tree05222f96c4476280d7a90990c196249bfb36d6ea
parent4a5ff1321debe0d37ba904670864103f071e6726 (diff)
Fix errors from delete code when viewing a user's profile while not logged in.
darcs-hash:20080720122715-533db-64247879e336666835880cd3de10bc2ef27e46c7.gz
-rw-r--r--actions/showstream.php22
1 files changed, 12 insertions, 10 deletions
diff --git a/actions/showstream.php b/actions/showstream.php
index 5c1e1d07f..8b473f76a 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -364,10 +364,12 @@ class ShowstreamAction extends StreamAction {
function show_notice($notice) {
$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',
'id' => 'notice-' . $notice->id));
@@ -405,12 +407,12 @@ class ShowstreamAction extends StreamAction {
common_raw('&rarr;');
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');
}
} \ No newline at end of file