Permalink
Browse files

Lookup portal state with correct context.

  • Loading branch information...
lrowe committed Nov 24, 2011
1 parent 1124cd4 commit 7b250115d9e687d70259308ddf42a29d67dcb1d2
Showing with 5 additions and 4 deletions.
  1. +3 −0 docs/HISTORY.txt
  2. +2 −4 src/plone/app/theming/utils.py
View
@@ -4,6 +4,9 @@ Changelog
1.0b10 - unreleased
-------------------
+* Lookup portal state with correct context.
+ [elro]
+
1.0b9 - 2011-11-02
------------------
@@ -172,17 +172,15 @@ def createExpressionContext(context, request):
expressions.
"""
- portal = getPortal()
-
contextState = queryMultiAdapter(
(context, request), name=u"plone_context_state")
portalState = queryMultiAdapter(
- (portal, request), name=u"plone_portal_state")
+ (context, request), name=u"plone_portal_state")
data = {
'context': context,
'request': request,
- 'portal': portal,
+ 'portal': portalState.portal(),
'context_state': contextState,
'portal_state': portalState,
'nothing': None,

0 comments on commit 7b25011

Please sign in to comment.