diff --git a/CHANGELOG.md b/CHANGELOG.md index 49da341ec1..004a0baa8e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,7 @@ All notable changes to this project will be documented in this file. - Fix WebUI handling of deleted quoted posts (#35909 and #35918 by @ClearlyClaire and @diondiondion) - Fix “Edit” and “Delete & Redraft” on a poll not inserting empty option (#35892 by @ClearlyClaire) - Fix loading of some compatibility CSS on some configurations (#35876 by @shleeable) -- Fix HttpLog not being enabled with `RAILS_LOGÈ_LEVEL=debug` (#35833 by @mjankowski) +- Fix HttpLog not being enabled with `RAILS_LOG_LEVEL=debug` (#35833 by @mjankowski) - Fix self-destruct scheduler behavior on some Redis setups (#35823 by @ClearlyClaire) - Fix `tootctl admin create` not bypassing reserved username checks (#35779 by @ClearlyClaire) - Fix interaction policy changes in implicit updates not being saved (#35751 by @ClearlyClaire) diff --git a/app/javascript/mastodon/actions/importer/normalizer.js b/app/javascript/mastodon/actions/importer/normalizer.js index d5e59b8b05..7723379804 100644 --- a/app/javascript/mastodon/actions/importer/normalizer.js +++ b/app/javascript/mastodon/actions/importer/normalizer.js @@ -81,7 +81,7 @@ export function normalizeStatus(status, normalOldStatus) { } else { // If the status has a CW but no contents, treat the CW as if it were the // status' contents, to avoid having a CW toggle with seemingly no effect. - if (normalStatus.spoiler_text && !normalStatus.content) { + if (normalStatus.spoiler_text && !normalStatus.content && !normalStatus.quote) { normalStatus.content = normalStatus.spoiler_text; normalStatus.spoiler_text = ''; }