[Zope-Checkins] CVS: Zope/lib/python/Products/SiteErrorLog - SiteErrorLog.py:1.11.2.1

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/Products/SiteErrorLog
In directory cvs.zope.org:/tmp/cvs-serv31373/lib/python/Products/SiteErrorLog

Modified Files:
      Tag: chrism-install-branch
	SiteErrorLog.py 
Log Message:
Merge with HEAD.  Again, sorry for the spew (what's left of it... someone seems to have filtered some of this branch's checkins out).


=== Zope/lib/python/Products/SiteErrorLog/SiteErrorLog.py 1.11 => 1.11.2.1 ===
--- Zope/lib/python/Products/SiteErrorLog/SiteErrorLog.py:1.11	Wed Aug 21 10:23:24 2002
+++ Zope/lib/python/Products/SiteErrorLog/SiteErrorLog.py	Sat Oct 26 15:51:43 2002
@@ -149,10 +149,13 @@
                 request = getattr(self, 'REQUEST', None)
                 url = None
                 username = None
+                userid   = None
                 req_html = None
                 if request:
                     url = request.get('URL', '?')
-                    username = getSecurityManager().getUser().getUserName()
+                    usr = getSecurityManager().getUser()
+                    username = usr.getUserName()
+                    userid = usr.getId()
                     try:
                         req_html = str(request)
                     except:
@@ -173,6 +176,7 @@
                     'tb_text': tb_text,
                     'tb_html': tb_html,
                     'username': username,
+                    'userid': userid,
                     'url': url,
                     'req_html': req_html,
                     })