summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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;