diff options
author | James Walker <walkah@walkah.net> | 2010-02-22 09:03:42 -0500 |
---|---|---|
committer | James Walker <walkah@walkah.net> | 2010-02-22 09:03:42 -0500 |
commit | 8fe097d7d165a002f3289c197a0d4ac89e02933e (patch) | |
tree | f0b4ea46c5056ad361fa0683ea3c289661bf3c4b /plugins/OStatus/classes | |
parent | 7b2ea7aa224c64cb0e44d4d445e07631a4cfeae3 (diff) | |
parent | 75fdef209245bf9424d4b995a42e4dfd980469d2 (diff) |
Merge remote branch 'statusnet/testing' into testing
Diffstat (limited to 'plugins/OStatus/classes')
-rw-r--r-- | plugins/OStatus/classes/Ostatus_profile.php | 4 |
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 |