From 681a59b23795166231cfebc0da4d0d219d528795 Mon Sep 17 00:00:00 2001
From: Gina Haeussge <gina@foosel.net>
Date: Sat, 26 Jun 2010 13:28:21 +0200
Subject: [PATCH] FS#1884: respect $conf['showuseras'] in feeds
---
feed.php | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/feed.php b/feed.php
index 73227e055..50786dd3a 100644
--- a/feed.php
+++ b/feed.php
@@ -253,7 +253,18 @@ function rss_buildItems(&$rss,&$data,$opt){
$item->author = '';
if($user && $conf['useacl'] && $auth){
$userInfo = $auth->getUserData($user);
- $item->author = $userInfo['name'];
+ if ($userInfo){
+ switch ($conf['showuseras']){
+ case 'username':
+ $item->author = $userInfo['name'];
+ break;
+ default:
+ $item->author = $user;
+ break;
+ }
+ } else {
+ $item->author = $user;
+ }
if($userInfo && !$opt['guardmail']){
$item->authorEmail = $userInfo['mail'];
}else{
--
GitLab