From 47300a2ae9a51108fbf59a57cf5ab6e8867b54a6 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 22 Feb 2010 01:21:34 -0800
Subject: Upgrade profile-based activity noun to have more complete set of
 profile fields

---
 lib/atom10feed.php         | 4 ++--
 lib/atomusernoticefeed.php | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/atom10feed.php b/lib/atom10feed.php
index 5e17b20d3..8842840d5 100644
--- a/lib/atom10feed.php
+++ b/lib/atom10feed.php
@@ -109,11 +109,11 @@ class Atom10Feed extends XMLStringer
             );
         }
 
-        if (!is_null($uri)) {
+        if (isset($uri)) {
             $xs->element('uri', null, $uri);
         }
 
-        if (!is_null(email)) {
+        if (isset($email)) {
             $xs->element('email', null, $email);
         }
 
diff --git a/lib/atomusernoticefeed.php b/lib/atomusernoticefeed.php
index f71c721fe..2ad8de455 100644
--- a/lib/atomusernoticefeed.php
+++ b/lib/atomusernoticefeed.php
@@ -60,8 +60,7 @@ class AtomUserNoticeFeed extends AtomNoticeFeed
         $this->user = $user;
         if (!empty($user)) {
             $profile = $user->getProfile();
-            $this->addAuthor($profile->getBestName(),
-                             $user->uri);
+            $this->addAuthor($profile->nickname, $user->uri);
         }
     }
 
-- 
cgit v1.2.3-54-g00ecf