fix: naive checking to handle uploaded images whose filenames end with '-resized'

This commit is contained in:
Julian Lam
2024-11-07 12:11:00 -05:00
parent 05fb8aa505
commit 1268ed50ca
2 changed files with 2 additions and 1 deletions

View File

@@ -19,7 +19,7 @@ define('forum/topic/images', [], function () {
} }
if (!imageEl.parent().is('a')) { if (!imageEl.parent().is('a')) {
if (utils.isRelativeUrl(src) && suffixRegex.test(src)) { if (utils.isRelativeUrl(src) && suffixRegex.test(src) && imageEl.get(0).naturalWidth >= config.resizeImageWidth) {
src = src.replace(suffixRegex, '$1'); src = src.replace(suffixRegex, '$1');
} }
const alt = imageEl.attr('alt') || ''; const alt = imageEl.attr('alt') || '';

View File

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