nodebb-plugin-composer-default 10.3.10 → 10.3.11

package/library.js

@@ -103,8 +103,9 @@ plugin.filterComposerBuild = async function (hookData) {
 
 	if (req.query.p) {
 		try {
-			const a = url.parse(req.query.p, true, true);
-			return helpers.redirect(res, `/${(a.path || '').replace(/^\/*/, '')}`);
+			const a = new URL(req.query.p, 'http://localhost.com');
+			const path = (a.pathname + a.search).replace(/^\/+/, '');
+			return helpers.redirect(res, `/${path}`);
 		} catch (e) {
 			return helpers.redirect(res, '/');
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-composer-default",
-  "version": "10.3.10",
+  "version": "10.3.11",
   "description": "Default composer for NodeBB",
   "main": "library.js",
   "repository": {

package/static/lib/composer.js

@@ -566,20 +566,23 @@ define('composer', [
 		var returnPath = window.location.pathname.slice(1) + window.location.search;
 
 		// Remove relative path from returnPath
-		if (returnPath.startsWith(config.relative_path.slice(1))) {
-			returnPath = returnPath.slice(config.relative_path.length);
+		if (config.relative_path && returnPath.startsWith(config.relative_path.slice(1))) {
+			returnPath = returnPath.slice(config.relative_path.length - 1);
+			if (returnPath.startsWith('/')) {
+				returnPath = returnPath.slice(1);
+			}
 		}
 
 		// Add in return path to be caught by ajaxify when post is completed, or if back is pressed
 		window.history.replaceState({
 			url: null,
 			returnPath: returnPath,
-		}, returnPath, config.relative_path + '/' + returnPath);
+		}, '', `${config.relative_path}/${returnPath}`);
 
 		// Update address bar in case f5 is pressed
 		window.history.pushState({
 			url: path,
-		}, path, `${config.relative_path}/${returnPath}`);
+		}, '', `${config.relative_path}/${returnPath}`);
 	}
 
 	function handleRemotePid(postContainer) {