summaryrefslogtreecommitdiff
path: root/actions/showstream.php
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-04-03 13:24:01 -0700
committerZach Copley <zach@controlyourself.ca>2009-04-03 13:24:01 -0700
commit590cc0c9a41206ba58c9333b4e9ef8931285f7e4 (patch)
tree6b6457534c26890e4d5912bc1afeabd63cf9c0c7 /actions/showstream.php
parentab2946047cd08c6b66cbc57410fa8a99430530f6 (diff)
parent81c72956a615eee04cf3770b4e197dd7fe563357 (diff)
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Diffstat (limited to 'actions/showstream.php')
-rw-r--r--actions/showstream.php20
1 files changed, 8 insertions, 12 deletions
diff --git a/actions/showstream.php b/actions/showstream.php
index b83f45d53..f5886f3d3 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -67,11 +67,17 @@ class ShowstreamAction extends Action
function title()
{
+ if (!empty($this->profile->fullname)) {
+ $base = $this->profile->fullname . ' (' . $this->user->nickname . ') ';
+ } else {
+ $base = $this->user->nickname;
+ }
+
if ($this->page == 1) {
- return $this->user->nickname;
+ return $base;
} else {
return sprintf(_("%s, page %d"),
- $this->user->nickname,
+ $base,
$this->page);
}
}
@@ -140,16 +146,6 @@ class ShowstreamAction extends Action
$nav->show();
}
- function showPageTitle()
- {
- $user =& common_current_user();
- if ($user && ($user->id == $this->profile->id)) {
- $this->element('h1', NULL, _("Your profile"));
- } else {
- $this->element('h1', NULL, sprintf(_('%s\'s profile'), $this->profile->nickname));
- }
- }
-
function showPageNoticeBlock()
{
return;