TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-27 18:52:14 +03:00
Code Issues Projects Releases Wiki Activity

changes to support URI's without a scheme in config.js.

Browse Source 
also removed "http:" from google fonts link to prevent a mixed content warning.
This commit is contained in:
Ryan Powell 2013-10-14 10:42:08 -04:00
parent 8ab4552ca0
commit dc1cf3b509
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/config-loader.js
View File

@ -60,8 +60,8 @@ function validateConfigEnvironment() {
} }
// Check that our url is valid // Check that our url is valid
parsedUrl = url.parse(config.url || 'invalid'); parsedUrl = url.parse(config.url || 'invalid', false, true);
if (!parsedUrl.protocol || !parsedUrl.host) { 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'); 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(); return when.reject();
} }

2
core/server/views/user-error.hbs
View File

@ -16,7 +16,7 @@
<link rel="shortcut icon" href="/favicon.ico"> <link rel="shortcut icon" href="/favicon.ico">
<meta http-equiv="cleartype" content="on"> <meta http-equiv="cleartype" content="on">
<link rel="stylesheet" type='text/css' href='http://fonts.googleapis.com/css?family=Open+Sans:400,300,700'> <link rel="stylesheet" type='text/css' href='//fonts.googleapis.com/css?family=Open+Sans:400,300,700'>
<link rel="stylesheet" href="/ghost/css/screen.css"> <link rel="stylesheet" href="/ghost/css/screen.css">
{{{block "pageStyles"}}} {{{block "pageStyles"}}}
</head> </head>