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 /lib | |
parent | 7b2ea7aa224c64cb0e44d4d445e07631a4cfeae3 (diff) | |
parent | 75fdef209245bf9424d4b995a42e4dfd980469d2 (diff) |
Merge remote branch 'statusnet/testing' into testing
Diffstat (limited to 'lib')
-rw-r--r-- | lib/atom10feed.php | 4 | ||||
-rw-r--r-- | lib/atomusernoticefeed.php | 3 |
2 files changed, 3 insertions, 4 deletions
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); } } |