Merge branch 'fix_alwaysSubject' into 'develop'

Hotfix for !388

See merge request pleroma/pleroma-fe!401

1 files changed, 2 insertions, 0 deletions

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index ea5d4ecd..a80baaf5 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -58,6 +58,7 @@ const afterStoreSetup = ({store, i18n}) => {
           var loginMethod = (config.loginMethod)
           var scopeCopy = (config.scopeCopy)
           var subjectLineBehavior = (config.subjectLineBehavior)
+          var alwaysShowSubjectInput = (config.alwaysShowSubjectInput)
 
           store.dispatch('setInstanceOption', { name: 'theme', value: theme })
           store.dispatch('setInstanceOption', { name: 'background', value: background })
@@ -75,6 +76,7 @@ const afterStoreSetup = ({store, i18n}) => {
           store.dispatch('setInstanceOption', { name: 'loginMethod', value: loginMethod })
           store.dispatch('setInstanceOption', { name: 'scopeCopy', value: scopeCopy })
           store.dispatch('setInstanceOption', { name: 'subjectLineBehavior', value: subjectLineBehavior })
+          store.dispatch('setInstanceOption', { name: 'alwaysShowSubjectInput', value: alwaysShowSubjectInput })
           if (chatDisabled) {
             store.dispatch('disableChat')
           }