From d4e0c770e3a79e5f36ce974f3ed4dd4834639f4f Mon Sep 17 00:00:00 2001
From: Jesse Morgan <jesse@jesterpm.net>
Date: Tue, 12 May 2015 07:23:54 -0700
Subject: Fixing undefined reference to config on error page.

---
 src/com/p4square/fmfacade/FreeMarkerPageResource.java | 8 ++++----
 src/com/p4square/grow/frontend/GrowFrontend.java      | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/com/p4square/fmfacade/FreeMarkerPageResource.java b/src/com/p4square/fmfacade/FreeMarkerPageResource.java
index c6cf81e..8c8948a 100644
--- a/src/com/p4square/fmfacade/FreeMarkerPageResource.java
+++ b/src/com/p4square/fmfacade/FreeMarkerPageResource.java
@@ -31,10 +31,11 @@ import com.p4square.session.Sessions;
 public class FreeMarkerPageResource extends ServerResource {
     private static Logger cLog = Logger.getLogger(FreeMarkerPageResource.class);
 
-    public static Map<String, Object> baseRootObject(Context context) {
+    public static Map<String, Object> baseRootObject(final Context context, final FMFacade fmf) {
         Map<String, Object> root = new HashMap<String, Object>();
 
         root.put("get", new GetMethod(context.getClientDispatcher()));
+        root.put("config", fmf.getConfig());
 
         return root;
     }
@@ -72,12 +73,11 @@ public class FreeMarkerPageResource extends ServerResource {
      * @return A map of objects and methods for the template to access.
      */
     protected Map<String, Object> getRootObject() {
-        Map<String, Object> root = baseRootObject(getContext());
+        Map<String, Object> root = baseRootObject(getContext(), mFMF);
 
         root.put("attributes", getRequestAttributes());
         root.put("query", getQuery().getValuesMap());
-        root.put("config", mFMF.getConfig());
-        
+
         if (getClientInfo().isAuthenticated()) {
             final User user = getClientInfo().getUser();
             final Map<String, String> userMap = new HashMap<String, String>();
diff --git a/src/com/p4square/grow/frontend/GrowFrontend.java b/src/com/p4square/grow/frontend/GrowFrontend.java
index 37d4984..1d221cc 100644
--- a/src/com/p4square/grow/frontend/GrowFrontend.java
+++ b/src/com/p4square/grow/frontend/GrowFrontend.java
@@ -77,7 +77,8 @@ public class GrowFrontend extends FMFacade {
     public synchronized void start() throws Exception {
         Template errorTemplate = getTemplate("templates/error.ftl");
         if (errorTemplate != null) {
-            ErrorPage.setTemplate(errorTemplate, FreeMarkerPageResource.baseRootObject(getContext()));
+            ErrorPage.setTemplate(errorTemplate,
+                    FreeMarkerPageResource.baseRootObject(getContext(), this));
         }
 
         super.start();
-- 
cgit v1.2.3