[CMF-checkins] SVN: CMF/branches/1.6/C - fixed 'request' provided by expression contexts

[Yvo Schubbe]

Log message for revision 67708:
  - fixed 'request' provided by expression contexts

Changed:
  U   CMF/branches/1.6/CHANGES.txt
  U   CMF/branches/1.6/CMFCore/Expression.py

-=-
Modified: CMF/branches/1.6/CHANGES.txt
===================================================================
--- CMF/branches/1.6/CHANGES.txt	2006-04-28 10:45:05 UTC (rev 67707)
+++ CMF/branches/1.6/CHANGES.txt	2006-04-28 10:45:12 UTC (rev 67708)
@@ -2,6 +2,9 @@
 
   Bug Fixes
 
+    - CMFCore Expression: Fixed 'request' provided by expression contexts.
+      'request' was not set correctly if 'object' is not specified.
+
     - CMFCore.interfaces._tools: Corrected the API given for 
       WorkflowDefinition.isActionSupported.
       (http://www.zope.org/Collectors/CMF/407)

Modified: CMF/branches/1.6/CMFCore/Expression.py
===================================================================
--- CMF/branches/1.6/CMFCore/Expression.py	2006-04-28 10:45:05 UTC (rev 67707)
+++ CMF/branches/1.6/CMFCore/Expression.py	2006-04-28 10:45:12 UTC (rev 67708)
@@ -101,10 +101,9 @@
         'folder':       folder,
         'portal':       portal,
         'nothing':      None,
-        'request':      getattr( object, 'REQUEST', None ),
+        'request':      getattr(portal, 'REQUEST', None),
         'modules':      SecureModuleImporter,
         'member':       member,
         'here':         object,
         }
     return getEngine().getContext(data)
-