about summary refs log tree commit diff
path: root/app/javascript
diff options
context:
space:
mode:
authorRens Groothuijsen <l.groothuijsen@alumni.maastrichtuniversity.nl>2021-12-26 19:22:05 +0100
committerGitHub <noreply@github.com>2021-12-26 19:22:05 +0100
commite65080181af82c14d3441a0890f2ba0a6fb9cd7e (patch)
tree17bea2a9f079a3e90ade398744d1e9cb413ba437 /app/javascript
parentd78ddb1cea4017122041eca3e44b894f71f512ac (diff)
Fix tag rendering error in hashtag column settings (#17184)
* Flatten tags in configuration to regular array before converting to JSON

* Render filter tags using toJS instead of toJSON
Diffstat (limited to 'app/javascript')
-rw-r--r--app/javascript/mastodon/features/hashtag_timeline/components/column_settings.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/mastodon/features/hashtag_timeline/components/column_settings.js b/app/javascript/mastodon/features/hashtag_timeline/components/column_settings.js
index de1127b0d..142118cef 100644
--- a/app/javascript/mastodon/features/hashtag_timeline/components/column_settings.js
+++ b/app/javascript/mastodon/features/hashtag_timeline/components/column_settings.js
@@ -33,8 +33,8 @@ class ColumnSettings extends React.PureComponent {
   tags (mode) {
     let tags = this.props.settings.getIn(['tags', mode]) || [];
 
-    if (tags.toJSON) {
-      return tags.toJSON();
+    if (tags.toJS) {
+      return tags.toJS();
     } else {
       return tags;
     }