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

7 years ago · fc3ecedf7c
parent 777d9aeee6 03dd9dd49b
commit fc3ecedf7c
1 changed files with 3 additions and 1 deletions
--- a/src/controllers/admin/uploads.js
+++ b/src/controllers/admin/uploads.js
@ -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;
 	});