Merge branch 'master' into spacebattles

2026-09-11 11:52:07 +08:00 · 2015-06-22 09:46:57 -05:00
parent b4bfdd5914 ab2eb447e2
commit 78f1760857
1 changed files with 5 additions and 1 deletions
@@ -781,7 +781,11 @@ class Story(Configurable):

            retlist = filter( lambda x : x!=None and x!='' ,retlist)

-        if listname == 'genre' and self.getConfig('add_genre_when_multi_category') and len(self.getList('category')) > 1:
+        if listname == 'genre' and self.getConfig('add_genre_when_multi_category') and len(self.getList('category',
+                                                                                                        removeallentities=False,
+                                                                                                        # to avoid inf loops if genre/cat substs
+                                                                                                        doreplacements=False
+                                                                                                        )) > 1:
            retlist.append(self.getConfig('add_genre_when_multi_category'))

        # reorder ships so b/a and c/b/a become a/b and a/b/c.  Only on '/',