summaryrefslogtreecommitdiff
path: root/actions/shownotice.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-10-31 14:47:21 -0400
committerEvan Prodromou <evan@status.net>2009-10-31 14:47:21 -0400
commit44ce8e2fcd1eba0d0f2723c246c1a021614e2763 (patch)
treeeacb1d8470354e7f7d55b0ca185690acf45cecd7 /actions/shownotice.php
parentbed942271d772e6eed36c4c012c48460510564f1 (diff)
parent8a333805df5fc3786ef8abe1d71421fb9270ff7f (diff)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'actions/shownotice.php')
-rw-r--r--actions/shownotice.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/actions/shownotice.php b/actions/shownotice.php
index 41408c23c..5d16fdad9 100644
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -172,9 +172,9 @@ class ShownoticeAction extends OwnerDesignAction
function title()
{
if (!empty($this->profile->fullname)) {
- $base = $this->profile->fullname . ' (' . $this->user->nickname . ') ';
+ $base = $this->profile->fullname . ' (' . $this->profile->nickname . ') ';
} else {
- $base = $this->user->nickname;
+ $base = $this->profile->nickname;
}
return sprintf(_('%1$s\'s status on %2$s'),