Fix issues with show any language option not working well

FriendsOfFlarum · Apr 10, 2022 · f1d26b5 · f1d26b5
1 parent ee513e7
commit f1d26b5
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/js/src/forum/addLanguageToDiscussionList.js b/js/src/forum/addLanguageToDiscussionList.js
@@ -1,3 +1,4 @@
+import app from 'flarum/forum/app';
 import { extend } from 'flarum/common/extend';
 import IndexPage from 'flarum/forum/components/IndexPage';
 import DiscussionHero from 'flarum/forum/components/DiscussionHero';
@@ -50,17 +51,20 @@ export default () => {
 
     const paramLang = app.search.params().language;
     const locale = app.search.params().language ?? app.translator.formatter.locale;
+    const showAnyOpt = app.forum.attribute('fof-discussion-language.showAnyLangOpt');
 
     if (params.filter.q) {
-      if (app.forum.attribute('fof-discussion-language.showAnyLangOpt')) {
+      if (showAnyOpt) {
         if (paramLang) {
           params.filter.q += ' language:' + paramLang;
         }
       } else {
         params.filter.q += ' language:' + locale;
       }
     } else {
-      params.filter.language = locale;
+      if (!showAnyOpt || paramLang) {
+        params.filter.language = locale;
+      }
     }
   });