Merge branch 'master' into develop

src/controllers/api.js

@@ -78,7 +78,6 @@ apiController.loadConfig = async function (req) {
 		enablePostHistory: meta.config.enablePostHistory === 1,
 		timeagoCutoff: meta.config.timeagoCutoff !== '' ? Math.max(0, parseInt(meta.config.timeagoCutoff, 10)) : meta.config.timeagoCutoff,
 		timeagoCodes: languages.timeagoCodes,
-		resizeImageWidth: meta.config.resizeImageWidth,
 		cookies: {
 			enabled: meta.config.cookieConsentEnabled === 1,
 			message: translator.escape(validator.escape(meta.config.cookieConsentMessage || '[[global:cookies.message]]')).replace(/\\/g, '\\\\'),

src/controllers/index.js

@@ -230,6 +230,10 @@ Controllers.confirmEmail = async (req, res) => {
 			...opts,
 		});
 	}
+
+	if (req.method === 'HEAD') {
+		return renderPage();
+	}
 	try {
 		if (req.loggedIn) {
 			const emailValidated = await user.getUserField(req.uid, 'email:confirmed');