summaryrefslogtreecommitdiff
path: root/plugins/OStatus/classes/Ostatus_profile.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-02-22 07:57:44 -0500
committerEvan Prodromou <evan@status.net>2010-02-22 07:57:44 -0500
commit75fdef209245bf9424d4b995a42e4dfd980469d2 (patch)
tree47196e16ac4bfe824b3d9ff9875d9c189b0161b3 /plugins/OStatus/classes/Ostatus_profile.php
parentb79d4ed6a1e61c600fdd382f3bdfde62aaa15b3d (diff)
handle poco nicknames in Ostatus_profile
Diffstat (limited to 'plugins/OStatus/classes/Ostatus_profile.php')
-rw-r--r--plugins/OStatus/classes/Ostatus_profile.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index 71885bcdc..0e12f8fc6 100644
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -832,7 +832,9 @@ class Ostatus_profile extends Memcached_DataObject
protected static function getActivityObjectNickname($object, $hints=array())
{
- // XXX: check whatever PoCo calls a nickname first
+ if (!empty($object->nickname)) {
+ return common_nicknamize($object->nickname);
+ }
// Try the definitive ID