Ports solution to resolve problem with EL functions
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b675844a Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b675844a Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b675844a Branch: refs/heads/master Commit: b675844a8f0de848d200439ed01ebbb532ca9b53 Parents: af82d23 Author: Lukasz Lenart <lukasz.len...@gmail.com> Authored: Tue Jan 12 08:51:34 2016 +0100 Committer: Lukasz Lenart <lukasz.len...@gmail.com> Committed: Tue Jan 12 08:51:34 2016 +0100 ---------------------------------------------------------------------- .../java/org/apache/struts2/views/freemarker/FreemarkerManager.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/b675844a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java index ddc7669..3323302 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java @@ -350,6 +350,7 @@ public class FreemarkerManager { servletContext.setAttribute(ATTR_APPLICATION_MODEL, servletContextModel); } TaglibFactory taglibs = new TaglibFactory(servletContext); + taglibs.setObjectWrapper(wrapper); servletContext.setAttribute(ATTR_JSP_TAGLIBS_MODEL, taglibs); } model.put(KEY_APPLICATION, servletContextModel);
