From b675844a8f0de848d200439ed01ebbb532ca9b53 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukasz.lenart@gmail.com>
Date: Tue, 12 Jan 2016 08:51:34 +0100
Subject: [PATCH] Ports solution to resolve problem with EL functions

---
 .../org/apache/struts2/views/freemarker/FreemarkerManager.java   | 1 +
 1 file changed, 1 insertion(+)

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 ddc7669eb..3323302ad 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);