Merge branch 'cherry-pick-254b0afa' into 'master'

Merge default content-type fix into master

See merge request pleroma/pleroma-fe!609

src/components/post_status_form/post_status_form.js

@@ -56,6 +56,10 @@ const PostStatusForm = {
           ? this.copyMessageScope
           : this.$store.state.users.currentUser.default_scope
 
+    const contentType = typeof this.$store.state.config.postContentType === 'undefined'
+      ? this.$store.state.instance.postContentType
+      : this.$store.state.config.postContentType
+
     return {
       dropFiles: [],
       submitDisabled: false,
@@ -67,7 +71,8 @@ const PostStatusForm = {
         status: statusText,
         nsfw: false,
         files: [],
-        visibility: scope
+        visibility: scope,
+        contentType
       },
       caret: 0
     }
@@ -166,11 +171,6 @@ const PostStatusForm = {
     },
     formattingOptionsEnabled () {
       return this.$store.state.instance.formattingOptionsEnabled
-    },
-    defaultPostContentType () {
-      return typeof this.$store.state.config.postContentType === 'undefined'
-        ? this.$store.state.instance.postContentType
-        : this.$store.state.config.postContentType
     }
   },
   methods: {

src/components/post_status_form/post_status_form.vue

@@ -35,7 +35,7 @@
       <div class="visibility-tray">
         <span class="text-format" v-if="formattingOptionsEnabled">
           <label for="post-content-type" class="select">
-            <select id="post-content-type" v-model="defaultPostContentType" class="form-control">
+            <select id="post-content-type" v-model="newStatus.contentType" class="form-control">
               <option value="text/plain">{{$t('post_status.content_type.plain_text')}}</option>
               <option value="text/html">HTML</option>
               <option value="text/markdown">Markdown</option>