summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2008-09-28 08:06:16 -0400
committerEvan Prodromou <evan@controlyourself.ca>2008-09-28 08:06:16 -0400
commit3544fca93240cfcf1bcd803dbdd07541a1cea1c5 (patch)
treea5967be2364d5924ea2b457950f8c58cce47c740
parent02a3f24b92f70531c9bf761729d569b8ce5d307c (diff)
shownotices takes user rather than profile in showstream
darcs-hash:20080928120616-5ed1f-fc0b136afff897a2d69f88dd83b6fc5df4f675b6.gz
-rw-r--r--actions/showstream.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/actions/showstream.php b/actions/showstream.php
index d0f72280b..5650038b3 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -58,7 +58,7 @@ class ShowstreamAction extends StreamAction {
$this->show_profile($profile);
- $this->show_notices($profile);
+ $this->show_notices($user);
common_show_footer();
}
@@ -335,7 +335,7 @@ class ShowstreamAction extends StreamAction {
common_element_end('div');
}
- function show_notices($profile) {
+ function show_notices($user) {
$page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
@@ -359,7 +359,7 @@ class ShowstreamAction extends StreamAction {
}
common_pagination($page>1, $cnt>NOTICES_PER_PAGE, $page,
- 'showstream', array('nickname' => $profile->nickname));
+ 'showstream', array('nickname' => $user->nickname));
}
function show_last_notice($profile) {