From 0630631f1ef84d976ba111ca60123a8acbf17ca7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cam=20Sa=C3=BCl?= <cammsaul@gmail.com>
Date: Mon, 24 Apr 2017 11:26:56 -0700
Subject: [PATCH] Fix overshadowing warning #4830
---
src/metabase/routes.clj | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/metabase/routes.clj b/src/metabase/routes.clj
index f33dfdbed20..1ec9576e01c 100644
--- a/src/metabase/routes.clj
+++ b/src/metabase/routes.clj
@@ -12,7 +12,7 @@
[metabase.util :as u]
[metabase.util.embed :as embed]))
-(defn- load-file [path]
+(defn- load-file-at-path [path]
(slurp (or (io/resource path)
(throw (Exception. (str "Cannot find '" path "'. Did you remember to build the Metabase frontend?"))))))
@@ -24,7 +24,7 @@
(load-template (str "frontend_client/" entry ".html")
{:bootstrap_json (json/generate-string (public-settings/public-settings))
:embed_code (when embeddable? (embed/head uri))})
- (load-file "frontend_client/init.html"))
+ (load-file-at-path "frontend_client/init.html"))
resp/response
(resp/content-type "text/html; charset=utf-8")))
--
GitLab