Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Julian Lam
2018-04-17 11:33:53 -04:00

View File

@@ -92,7 +92,9 @@ function buildBreadcrumbs(currentFolder) {
var dir = path.join(currentPath, part);
crumbs.push({
text: part || 'Uploads',
url: part ? '/admin/manage/uploads?dir=' + dir : '/admin/manage/uploads',
url: part
? (nconf.get('relative_path') + '/admin/manage/uploads?dir=' + dir)
: nconf.get('relative_path') + '/admin/manage/uploads',
});
currentPath = dir;
});