Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-06-19 21:40:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

closes #3220

Browse Source 
added back base_url
This commit is contained in:
barisusakli
2015-06-08 13:55:14 -04:00
parent 3a36ae5c13
commit ed72bacb1f
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app.js
View File

@@ -118,6 +118,7 @@ function start() {
// Parse out the relative_url and other goodies from the configured URL
var urlObject = url.parse(nconf.get('url'));
var relativePath = urlObject.pathname !== '/' ? urlObject.pathname : '';
nconf.set('base_url', urlObject.protocol + '//' + urlObject.host);
nconf.set('use_port', !!urlObject.port);
nconf.set('relative_path', relativePath);
nconf.set('port', urlObject.port || nconf.get('port') || nconf.get('PORT') || 4567);

11
src/user/digest.js
View File

@@ -39,14 +39,9 @@ var async = require('async'),
// Fix relative paths in topic data
data.topics.topics = data.topics.topics.map(function(topicObj) {
if (topicObj.hasOwnProperty('teaser') && topicObj.teaser !== undefined) {
if (utils.isRelativeUrl(topicObj.teaser.user.picture)) {
topicObj.teaser.user.picture = nconf.get('url') + topicObj.teaser.user.picture;
}
} else {
if (utils.isRelativeUrl(topicObj.user.picture)) {
topicObj.user.picture = nconf.get('url') + topicObj.user.picture;
}
var user = topicObj.hasOwnProperty('teaser') && topicObj.teaser !== undefined ? topicObj.teaser.user : topicObj.user;
if (user && user.picture && utils.isRelativeUrl(user.picture)) {
user.picture = nconf.get('base_url') + user.picture;
}
return topicObj;