summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-03-30 09:58:28 -0400
committerEvan Prodromou <evan@controlyourself.ca>2009-03-30 09:58:49 -0400
commitce212c3903cfa7a81aa130dc8d1dff6ae890572e (patch)
tree8d4841d5abc64ceca6334147b8f9cc2443b8d281
parent1116526f0855af47b353722907c57e1b4285cddc (diff)
full name in title and h1 of the personal profile
-rw-r--r--actions/showstream.php20
1 files changed, 8 insertions, 12 deletions
diff --git a/actions/showstream.php b/actions/showstream.php
index 65482167e..9b6536293 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;