Merge remote-tracking branch 'origin/develop' into small-fixes-and-improvements

2026-05-13 16:14:41 +03:00 · 2026-05-13 16:14:41 +03:00 · f21d1dbac8
commit f21d1dbac8
parent c05381e6aa cb638d57e8
4 changed files with 68 additions and 2 deletions
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@ -381,7 +381,11 @@ const PostStatusForm = {
      },
    },
    defaultQuotable() {
-      if (!this.quotingAvailable || !this.isReply) {
+      if (
+        !this.quotingAvailable ||
+        !this.isReply ||
+        !useMergedConfigStore().mergedConfig.quoteReply
+      ) {
        return false
      }

--- a/src/components/status_action_buttons/status_action_buttons.js
+++ b/src/components/status_action_buttons/status_action_buttons.js
@ -16,7 +16,7 @@ library.add(faEllipsisH)

 const StatusActionButtons = {
  props: ['status', 'replying'],
-  emits: ['toggleReplying'],
+  emits: ['toggleReplying', 'onSuccess', 'onError'],
  data() {
    return {
      showPin: false,