From eace410c653b320ae63ae195fbe53bcc87e24524 Mon Sep 17 00:00:00 2001
From: Yoshinori Okuji <yo@nexedi.com>
Date: Fri, 23 Oct 2009 06:05:17 +0000
Subject: [PATCH] Sorry, the previously reverted change seems to be not the
 real cause of the problem, so I re-patch it again.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@29954 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 product/CMFActivity/ActivityTool.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/product/CMFActivity/ActivityTool.py b/product/CMFActivity/ActivityTool.py
index eeb86a1de2..59a51672a7 100644
--- a/product/CMFActivity/ActivityTool.py
+++ b/product/CMFActivity/ActivityTool.py
@@ -856,6 +856,12 @@ class ActivityTool (Folder, UniqueObject):
         if not acquired:
           return
 
+        # make sure our skin is set-up. On CMF 1.5 it's setup by acquisition,
+        # but on 2.2 it's by traversal, and our site probably wasn't traversed
+        # by the timerserver request, which goes into the Zope Control_Panel
+        # calling it a second time is a harmless and cheap no-op.
+        # both setupCurrentSkin and REQUEST are acquired from containers.
+        self.setupCurrentSkin(self.REQUEST)
         try:
           old_sm = getSecurityManager()
           try:
-- 
2.30.9