From dc1cf3b5094e65c172826588f2b4b8ad5511c2e5 Mon Sep 17 00:00:00 2001 From: Ryan Powell Date: Mon, 14 Oct 2013 10:42:08 -0400 Subject: [PATCH] changes to support URI's without a scheme in config.js. also removed "http:" from google fonts link to prevent a mixed content warning. --- core/config-loader.js | 4 ++-- core/server/views/user-error.hbs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/config-loader.js b/core/config-loader.js index 9bf238264c..74575ae129 100644 --- a/core/config-loader.js +++ b/core/config-loader.js @@ -60,8 +60,8 @@ function validateConfigEnvironment() { } // Check that our url is valid - parsedUrl = url.parse(config.url || 'invalid'); - if (!parsedUrl.protocol || !parsedUrl.host) { + parsedUrl = url.parse(config.url || 'invalid', false, true); + if (!parsedUrl.host) { errors.logError(new Error('Your site url in config.js is invalid.'), config.url, 'Please make sure this is a valid url before restarting'); return when.reject(); } diff --git a/core/server/views/user-error.hbs b/core/server/views/user-error.hbs index 49e1b0a5df..3d7d5d4c5c 100644 --- a/core/server/views/user-error.hbs +++ b/core/server/views/user-error.hbs @@ -16,7 +16,7 @@ - + {{{block "pageStyles"}}}