From 75ded76e4451bfbc52e631ed793bcf18bf3ebede Mon Sep 17 00:00:00 2001
From: David Adams <daveadams@gmail.com>
Date: Mon, 19 Oct 2015 22:06:51 -0500
Subject: [PATCH] UI formatURL: render null token correctly

If the token argument to formatURL is null, it should be rendered as the
empty string and not the string 'null'.

Should fix #1316 in which Safari gets a 403 error when visiting the
key/value page in the web UI.
---
 ui/javascripts/app/routes.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ui/javascripts/app/routes.js b/ui/javascripts/app/routes.js
index d964b8e9e5..bedf867059 100644
--- a/ui/javascripts/app/routes.js
+++ b/ui/javascripts/app/routes.js
@@ -379,6 +379,9 @@ App.SettingsRoute = App.BaseRoute.extend({
 
 // Adds any global parameters we need to set to a url/path
 function formatUrl(url, dc, token) {
+  if (token == null) {
+    token = "";
+  }
   if (url.indexOf("?") > 0) {
     // If our url has existing params
     url = url + "&dc=" + dc;