summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/atom10feed.php4
-rw-r--r--lib/atomusernoticefeed.php3
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);
}
}