fix for feed whith Apache auth and no ACL #981

darcs-hash:20061213192616-7ad00-526c26ebf249c07c6188f0062e928d70c7ee89db.gz

1 files changed, 5 insertions, 1 deletions

diff --git a/feed.php b/feed.php
index f477de31b..298c20a65 100644
--- a/feed.php
+++ b/feed.php
@@ -161,7 +161,7 @@ function rssRecentChanges(&$rss,$num,$ltype,$ns,$minor){
         $user = @$recent['user']; // the @ spares time repeating lookup
         $item->author = '';
 
-        if($user){
+        if($user && $conf['useacl']){
             $userInfo = $auth->getUserData($user);
             $item->author = $userInfo['name'];
             if($guardmail) {
@@ -170,6 +170,10 @@ function rssRecentChanges(&$rss,$num,$ltype,$ns,$minor){
             }else{
                 $item->authorEmail = $userInfo['mail'];
             }
+        }elseif($user){
+            // this happens when no ACL but some Apache auth is used
+            $item->author      = $user;
+            $item->authorEmail = $user.'@'.$recent['ip'];
         }else{
             $item->authorEmail = 'anonymous@'.$recent['ip'];
         }