Improved

packages/app/src/server/routes/page.js

@@ -564,10 +564,6 @@ module.exports = function(crowi, app) {
    */
   async function redirector(req, res, next, path) {
     const pages = await Page.findByPathAndViewer(path, req.user, null, false);
-    let query = '';
-    Object.entries(req.query).forEach(([key, value], i) => {
-      query += i === 0 ? `?${key}=${value}` : `&${key}=${value}`;
-    });
 
     if (pages.length >= 2) {
       // TODO: return res.render('layout-growi/select_same_path_page', renderVars);
@@ -575,6 +571,11 @@ module.exports = function(crowi, app) {
       return res.send('Two or more pages found.');
     }
 
+    let query = '';
+    Object.entries(req.query).forEach(([key, value], i) => {
+      query += i === 0 ? `?${key}=${value}` : `&${key}=${value}`;
+    });
+
     if (pages.length === 1) {
       return res.safeRedirect(`/${pages[0]._id}${query}`);
     }