summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2009-10-30 16:53:23 -0400
committerBrion Vibber <brion@pobox.com>2009-10-30 16:55:47 -0400
commitb7ed31c27bc883b7b7b6a9af6391aacd8d897d78 (patch)
tree9bf3a5e033190ee45b96d1c597968f4e6b8ecd57 /actions
parentfc22bde67cd9a92ffb27bd8ce9258035fb25e582 (diff)
Use nickname from profile, not user object, to avoid barfing warnings on Twitter messages imported into the timeline.
Diffstat (limited to 'actions')
-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'),