From 6aae1623856192860d8966efafb24dc4dc7ea718 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Mon, 24 Mar 2014 11:31:19 +0100
Subject: [PATCH] let adopt_user get to the zope admin user

---
 src/plone/api/env.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/plone/api/env.py b/src/plone/api/env.py
index fb18122..ce8652c 100644
--- a/src/plone/api/env.py
+++ b/src/plone/api/env.py
@@ -39,7 +39,10 @@ def adopt_user(username=None, user=None):
     acl_users = portal.get().acl_users
     unwrapped = acl_users.getUser(username)
     if unwrapped is None:
-        raise UserNotFoundError
+        acl_users = portal.get().unrestrictedTraverse('/').acl_users
+        unwrapped = acl_users.getUser(username)
+        if unwrapped is None:
+            raise UserNotFoundError
 
     # ZopeSecurityPolicy appears to strongly expect the user object to
     # be Acquisition-wrapped in the acl_users from which it was taken.