Fix errors from delete code when viewing a user's profile while not logged in.
darcs-hash:20080720122715-533db-64247879e336666835880cd3de10bc2ef27e46c7.gz
This commit is contained in:
parent
4a5ff1321d
commit
26f6c917a7
@ -364,10 +364,12 @@ class ShowstreamAction extends StreamAction {
|
|||||||
|
|
||||||
function show_notice($notice) {
|
function show_notice($notice) {
|
||||||
$profile = $notice->getProfile();
|
$profile = $notice->getProfile();
|
||||||
if (common_logged_in()) {
|
if (common_logged_in()) {
|
||||||
$user = common_current_user();
|
$user = common_current_user();
|
||||||
$user_profile = $user->getProfile();
|
$user_profile = $user->getProfile();
|
||||||
}
|
} else {
|
||||||
|
$user_profile = false;
|
||||||
|
}
|
||||||
# XXX: RDFa
|
# XXX: RDFa
|
||||||
common_element_start('li', array('class' => 'notice_single',
|
common_element_start('li', array('class' => 'notice_single',
|
||||||
'id' => 'notice-' . $notice->id));
|
'id' => 'notice-' . $notice->id));
|
||||||
@ -405,12 +407,12 @@ class ShowstreamAction extends StreamAction {
|
|||||||
common_raw('→');
|
common_raw('→');
|
||||||
common_element_end('a');
|
common_element_end('a');
|
||||||
common_element_end('p');
|
common_element_end('p');
|
||||||
if ($notice->profile_id == $user_profile->id) {
|
if ($user_profile && $notice->profile_id == $user_profile->id) {
|
||||||
$deleteurl = common_local_url('deletenotice', array('notice' => $notice->id));
|
$deleteurl = common_local_url('deletenotice', array('notice' => $notice->id));
|
||||||
common_element('a', array('class' => 'deletenotice',
|
common_element('a', array('class' => 'deletenotice',
|
||||||
'href' => $deleteurl),
|
'href' => $deleteurl),
|
||||||
_('delete'));
|
_('delete'));
|
||||||
}
|
}
|
||||||
common_element_end('li');
|
common_element_end('li');
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user