From: Claire <claire.github-309c@sitedethib.com>
Date: Sat, 12 Feb 2022 20:36:33 +0000 (+0100)
Subject: Merge branch 'main' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=c9669ee1673368c09f4c7153e4bc56a9a5c68410;p=mastodon.git

Merge branch 'main' into glitch-soc/merge-upstream
---

c9669ee1673368c09f4c7153e4bc56a9a5c68410
diff --cc app/javascript/mastodon/features/compose/components/compose_form.js
index 311d00626,d75145a09..26232247d
--- a/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@@@ -260,10 -259,10 +260,10 @@@ class ComposeForm extends ImmutablePure
            <div className='compose-form__buttons'>
              <UploadButtonContainer />
              <PollButtonContainer />
-             <PrivacyDropdownContainer />
+             <PrivacyDropdownContainer disabled={this.props.isEditing} />
              <SpoilerButtonContainer />
            </div>
 -          <div className='character-counter__wrapper'><CharacterCounter max={500} text={this.getFulltextForCharacterCounting()} /></div>
 +          <div className='character-counter__wrapper'><CharacterCounter max={maxChars} text={this.getFulltextForCharacterCounting()} /></div>
          </div>
  
          <div className='compose-form__publish'>