summaryrefslogtreecommitdiff
path: root/actions/shownotice.php
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@status.net>2009-10-30 21:45:22 +0000
committerSarven Capadisli <csarven@status.net>2009-10-30 21:45:22 +0000
commita2302e5b76b827f906c5ded028e7c120c6200b76 (patch)
tree0c0d3af1c94cfde82074191301870f56624f6b5c /actions/shownotice.php
parentdb9aef9f67a9448e73f6ee3463329045e41084f3 (diff)
parentb7ed31c27bc883b7b7b6a9af6391aacd8d897d78 (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'),