[Erp5-report] r29954 - /erp5/trunk/products/CMFActivity/ActivityTool.py

[nobody at svn.erp5.org]

Author: yo
Date: Fri Oct 23 08:05:17 2009
New Revision: 29954

URL: http://svn.erp5.org?rev=29954&view=rev
Log:
Sorry, the previously reverted change seems to be not the real cause of the problem, so I re-patch it again.

Modified:
    erp5/trunk/products/CMFActivity/ActivityTool.py

Modified: erp5/trunk/products/CMFActivity/ActivityTool.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/ActivityTool.py?rev=29954&r1=29953&r2=29954&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/ActivityTool.py [utf8] (original)
+++ erp5/trunk/products/CMFActivity/ActivityTool.py [utf8] Fri Oct 23 08:05:17 2009
@@ -856,6 +856,12 @@
         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: