about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRens Groothuijsen <l.groothuijsen@alumni.maastrichtuniversity.nl>2021-12-26 19:22:05 +0100
committerClaire <claire.github-309c@sitedethib.com>2021-12-27 15:22:12 +0100
commitf011787003bcb801b487ad3f5229e324a37c9e1d (patch)
treeb477529aea467279c73b35c87124d7355861646a
parent09c61e13767f7b77618949f422f229b638381088 (diff)
[Glitch] Fix tag rendering error in hashtag column settings
Port e65080181af82c14d3441a0890f2ba0a6fb9cd7e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
-rw-r--r--app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.js b/app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.js
index de1127b0d..142118cef 100644
--- a/app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.js
+++ b/app/javascript/flavours/glitch/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;
     }