[Checkins] SVN: CMF/trunk/ Merged c79320 from the 2.1 branch into trunk

[Hanno Schlichting]

Log message for revision 79321:
  Merged c79320 from the 2.1 branch into trunk
  

Changed:
  _U  CMF/trunk/
  U   CMF/trunk/CMFCore/PortalObject.py
  U   CMF/trunk/CMFDefault/skins/zpt_generic/getMainGlobals.py
  U   CMF/trunk/EXTERNALS.txt

-=-

Property changes on: CMF/trunk
___________________________________________________________________
Name: svn:externals
   - #
# Used for maintenance of external resources in this svn bundle.  Edit
# this file as appropriate and then run the following command from within
# the checkout directory where this file lives on your local machine:
#
# svn propset svn:externals -F ./EXTERNALS.TXT .
#
GenericSetup svn://svn.zope.org/repos/main/GenericSetup/trunk

   + #
# Used for maintenance of external resources in this svn bundle.  Edit
# this file as appropriate and then run the following command from within
# the checkout directory where this file lives on your local machine:
#
# svn propset svn:externals -F ./EXTERNALS.TXT .
#
GenericSetup svn+ssh://svn.zope.org/repos/main/GenericSetup/trunk


Modified: CMF/trunk/CMFCore/PortalObject.py
===================================================================
--- CMF/trunk/CMFCore/PortalObject.py	2007-08-28 17:31:44 UTC (rev 79320)
+++ CMF/trunk/CMFCore/PortalObject.py	2007-08-28 17:35:34 UTC (rev 79321)
@@ -15,6 +15,7 @@
 $Id$
 """
 
+from Acquisition import aq_base
 from five.localsitemanager import find_next_sitemanager
 from five.localsitemanager.registry import FiveVerifyingAdapterLookup
 from five.localsitemanager.registry import PersistentComponents
@@ -67,17 +68,19 @@
             if next is None:
                 next = base
             name = '/'.join(self.getPhysicalPath())
-            self._components = PersistentComponents(name, (next,))
-            self._components.__parent__ = self
+            self._components = components = PersistentComponents(name, (next,))
+            components.__parent__ = self
         elif self._components.utilities.LookupClass \
                 != FiveVerifyingAdapterLookup:
             # BBB: for CMF 2.1 beta instances
             # XXX: should be removed again after the CMF 2.1 beta2 release
-            self._components.utilities.LookupClass \
-                    = FiveVerifyingAdapterLookup
-            self._components.utilities._createLookup()
-            self._components.utilities.__parent__ = self._components
-            self._components.__parent__ = self
+            components = aq_base(self._components)
+            components.__parent__ = self
+            utilities = aq_base(components.utilities)
+            utilities.LookupClass = FiveVerifyingAdapterLookup
+            utilities._createLookup()
+            utilities.__parent__ = components
+            
         return self._components
 
     def __before_publishing_traverse__(self, arg1, arg2=None):

Modified: CMF/trunk/CMFDefault/skins/zpt_generic/getMainGlobals.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_generic/getMainGlobals.py	2007-08-28 17:31:44 UTC (rev 79320)
+++ CMF/trunk/CMFDefault/skins/zpt_generic/getMainGlobals.py	2007-08-28 17:35:34 UTC (rev 79321)
@@ -13,7 +13,7 @@
 wtool = getToolByName(script, 'portal_workflow')
 portal_object = utool.getPortalObject()
 
-if not 'charset' in context.REQUEST.RESPONSE.getHeader('content-type'):
+if not 'charset' in (context.REQUEST.RESPONSE.getHeader('content-type') or ''):
     # Some newstyle views set a different charset - don't override it.
     # Oldstyle views need the default_charset.
     default_charset = ptool.getProperty('default_charset', None)

Modified: CMF/trunk/EXTERNALS.txt
===================================================================
--- CMF/trunk/EXTERNALS.txt	2007-08-28 17:31:44 UTC (rev 79320)
+++ CMF/trunk/EXTERNALS.txt	2007-08-28 17:35:34 UTC (rev 79321)
@@ -5,4 +5,4 @@
 #
 # svn propset svn:externals -F ./EXTERNALS.TXT .
 #
-GenericSetup svn://svn.zope.org/repos/main/GenericSetup/trunk
+GenericSetup svn+ssh://svn.zope.org/repos/main/GenericSetup/trunk