diff options
| author | Shpuld Shpludson <shp@cock.li> | 2018-12-19 04:51:21 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2018-12-19 04:51:21 +0000 |
| commit | c54b1fd0c517145f323f5fe0df9af5131137406a (patch) | |
| tree | 4bd9b7de1c1822db373364659bc311b8de711fb6 /src/components/status | |
| parent | 562c68a51c9746650fabfc5c641816396439c791 (diff) | |
| parent | c7514be46fd9dbffdeb92cd01799a8dc6497011b (diff) | |
Merge branch 'fix_defaults' into 'develop'
Fixed some settings not using defaults from instance config.
Closes #228
See merge request pleroma/pleroma-fe!429
Diffstat (limited to 'src/components/status')
| -rw-r--r-- | src/components/status/status.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/components/status/status.js b/src/components/status/status.js index 47a62fdf..e683056f 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -188,7 +188,9 @@ const Status = { }, replySubject () { if (!this.status.summary) return '' - const behavior = this.$store.state.config.subjectLineBehavior + const behavior = typeof this.$store.state.config.subjectLineBehavior === 'undefined' + ? this.$store.state.instance.subjectLineBehavior + : this.$store.state.config.subjectLineBehavior const startsWithRe = this.status.summary.match(/^re[: ]/i) if (behavior !== 'noop' && startsWithRe || behavior === 'masto') { return this.status.summary |