Back out getUserById fix in deference to getOwner patch

doc/CHANGES.txt

@@ -53,7 +53,7 @@ Zope Changes
       - Collector #250: applied several patches for TextIndex for better
         unicode support for the GlobbingLexicon
 
-      - Collector #254: user object was being returned without wrapping
+      - Collector #254: return owner object from getOwner wrapped in its
         context
 
 

lib/python/AccessControl/User.py

@@ -12,7 +12,7 @@
 ##############################################################################
 """Access control package"""
 
-__version__='$Revision: 1.167 $'[11:-2]
+__version__='$Revision: 1.168 $'[11:-2]
 
 import Globals, socket, SpecialUsers,re
 import os
@@ -490,8 +490,7 @@ class BasicUserFolder(Implicit, Persistent, Navigation, Tabs, RoleManager,
         # The connection between getting by ID and by name is not a strong
         # one
         try:
-            result=self.getUser(id)
-            return result.__of__(self) # Wrap in our context
+            return self.getUser(id)
         except:
            if default is _marker: raise
            return default