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

[Yvo Schubbe]

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

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

-=-
Modified: CMF/branches/2.0/CHANGES.txt
===================================================================
--- CMF/branches/2.0/CHANGES.txt	2006-04-28 10:45:12 UTC (rev 67708)
+++ CMF/branches/2.0/CHANGES.txt	2006-04-28 10:45:18 UTC (rev 67709)
@@ -1,10 +1,14 @@
-After CMF 2.0.0 (unreleased)
+CMF 2.0.1-beta (unreleased)
 
   Bug Fixes
 
+    - CMFCore Expression: Fixed 'request' provided by expression contexts.
+      'request' was not set correctly if 'object' is not specified.
+
     - CMFCore.exportimport.typeinfo:  Added BBB support for really old
       typeinfo instances which still return mappings instead of ActionInfos.
 
+
 CMF 2.0.0 (2006/04/16)
 
   New Features

Modified: CMF/branches/2.0/CMFCore/Expression.py
===================================================================
--- CMF/branches/2.0/CMFCore/Expression.py	2006-04-28 10:45:12 UTC (rev 67708)
+++ CMF/branches/2.0/CMFCore/Expression.py	2006-04-28 10:45:18 UTC (rev 67709)
@@ -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)
-