Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 08:36:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: unescape header navigation originalRoute [breaking]

Browse Source
This commit is contained in:
Julian Lam
2021-01-08 10:33:48 -05:00
parent 03a0e72fae
commit 6cb5888c13
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/middleware/header.js
View File

@@ -177,7 +177,7 @@ async function appendUnreadCounts({ uid, navigation, unreadData }) {
const tidsByFilter = results.unreadData.tidsByFilter; const tidsByFilter = results.unreadData.tidsByFilter;
navigation = navigation.map(function (item) { navigation = navigation.map(function (item) {
function modifyNavItem(item, route, filter, content) { function modifyNavItem(item, route, filter, content) {
if (item && validator.unescape(item.originalRoute) === route) { if (item && item.originalRoute === route) {
unreadData[filter] = _.zipObject(tidsByFilter[filter], tidsByFilter[filter].map(() => true)); unreadData[filter] = _.zipObject(tidsByFilter[filter], tidsByFilter[filter].map(() => true));
item.content = content; item.content = content;
if (unreadCounts[filter] > 0) { if (unreadCounts[filter] > 0) {

3
src/navigation/index.js
View File

@@ -1,6 +1,7 @@
'use strict'; 'use strict';
const nconf = require('nconf'); const nconf = require('nconf');
const validator = require('validator');
const admin = require('./admin'); const admin = require('./admin');
const groups = require('../groups'); const groups = require('../groups');
@@ -12,7 +13,7 @@ navigation.get = async function (uid) {
let data = await admin.get(); let data = await admin.get();
data = data.filter(item => item && item.enabled).map(function (item) { data = data.filter(item => item && item.enabled).map(function (item) {
item.originalRoute = item.route; item.originalRoute = validator.unescape(item.route);
if (!item.route.startsWith('http')) { if (!item.route.startsWith('http')) {
item.route = relative_path + item.route; item.route = relative_path + item.route;