getUserData should really be implemented always... (FS#1272)

... but with this patch DokuWiki will not break completely when left out for
trustExternal() auth backends

darcs-hash:20071203201532-7ad00-72dbc2d16e4c8c09cca9558286164f4d858c19ce.gz

1 files changed, 4 insertions, 4 deletions

diff --git a/feed.php b/feed.php
index b632918d4..32885fcef 100644
--- a/feed.php
+++ b/feed.php
@@ -236,11 +236,11 @@ function rss_buildItems(&$rss,&$data,$opt){
         if($user && $conf['useacl'] && $auth){
             $userInfo = $auth->getUserData($user);
             $item->author = $userInfo['name'];
-            if($opt['guardmail']) {
-            //cannot obfuscate because some RSS readers may check validity
-                $item->authorEmail = $user.'@'.$recent['ip'];
-            }else{
+            if($userInfo && !$opt['guardmail']){
                 $item->authorEmail = $userInfo['mail'];
+            }else{
+                //cannot obfuscate because some RSS readers may check validity
+                $item->authorEmail = $user.'@'.$recent['ip'];
             }
         }elseif($user){
             // this happens when no ACL but some Apache auth is used