Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-05 08:38:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/NodeBB/NodeBB

Browse Source
This commit is contained in:
barisusakli
2016-08-24 12:14:33 +03:00
parent 0fb74a2636 2e1e40026a
commit 768c1b37d4
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app.js
View File

@@ -124,7 +124,7 @@ function start() {
nconf.set('secure', urlObject.protocol === 'https:');
nconf.set('use_port', !!urlObject.port);
nconf.set('relative_path', relativePath);
nconf.set('port', urlObject.port || nconf.get('port') || nconf.get('PORT') || 4567);
nconf.set('port', urlObject.port || nconf.get('port') || nconf.get('PORT') || (nconf.get('PORT_ENV_VAR') ? nconf.get(nconf.get('PORT_ENV_VAR')) : false) || 4567);
nconf.set('upload_url', nconf.get('upload_path').replace(/^\/public/, ''));
if (nconf.get('isPrimary') === 'true') {

4
public/src/modules/search.js
View File

@@ -75,7 +75,7 @@ define('search', ['navigator', 'translator'], function(nav, translator) {
Search.getSearchPreferences = function() {
try {
return JSON.parse(localStorage.getItem('search-preferences'));
return JSON.parse(localStorage.getItem('search-preferences') || '{}');
} catch(e) {
return {};
}
@@ -179,4 +179,4 @@ define('search', ['navigator', 'translator'], function(nav, translator) {
};
return Search;
});
});