diff options
author | Sean Murphy <sgmurphy@gmail.com> | 2009-02-07 11:02:10 -0500 |
---|---|---|
committer | Sean Murphy <sgmurphy@gmail.com> | 2009-02-07 11:02:10 -0500 |
commit | a3d5e00f64b3c166e34a8d36fcb4f5b757394e9b (patch) | |
tree | 91576e428997bc6cc826fa2cead37794961de23c /actions/all.php | |
parent | d90089314944ed1696f66cabbb6935ea61e4b2e6 (diff) | |
parent | 08db50b24eaf9e6e5f651448c394f1f50dd2409b (diff) |
Merge commit 'upstream/0.7.x' into 0.7.x
Conflicts:
actions/showstream.php
Diffstat (limited to 'actions/all.php')
-rw-r--r-- | actions/all.php | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/actions/all.php b/actions/all.php index 428466f24..d75d1b946 100644 --- a/actions/all.php +++ b/actions/all.php @@ -42,6 +42,9 @@ class AllAction extends Action if (!$this->page) { $this->page = 1; } + + common_set_returnto($this->selfUrl()); + return true; } @@ -101,4 +104,15 @@ class AllAction extends Action $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE, $this->page, 'all', array('nickname' => $this->user->nickname)); } + + function showPageTitle() + { + $user =& common_current_user(); + if ($user && ($user->id == $this->user->id)) { + $this->element('h1', NULL, _("You and friends")); + } else { + $this->element('h1', NULL, sprintf(_('%s and friends'), $this->user->nickname)); + } + } + } |