Fix #3081 — Make CATEGORY_PAGES_FOLLOW_DESTPATH more resilient

Kwpolska · Kwpolska · commit 9ed0cfa0d1ae · 2018-05-09T19:20:13.000+02:00
Signed-off-by: Chris Warrick &lt;kwpolska@gmail.com&gt;
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -9,6 +9,7 @@ Features
 Bugfixes
 --------
 
+* Make ``CATEGORY_PAGES_FOLLOW_DESTPATH`` more resilient (Issue #3081)
 * Guard against null items in gallery meta files (Issues #3076, #3077)
 * Respect ``USE_FILENAME_AS_TITLE`` in galleries with a meta file
 * Fix gallery metadata for multilingual sites (Issue #3078)
diff --git a/nikola/plugins/task/categories.py b/nikola/plugins/task/categories.py
@@ -130,12 +130,7 @@ def get_path(self, classification, lang, dest_type='page'):
             sub_dir = []
             for post in self.site.posts_per_category[cat_string]:
                 if post.category_from_destpath:
-                    if not self.site.config['CATEGORY_DESTPATH_FIRST_DIRECTORY_ONLY']:
-                        base_dir = post.folders[lang]
-                    elif post.folder_relative == '.':
-                        base_dir = post.folder_base(lang)
-                    else:
-                        base_dir = post.folder_base(lang) + os.sep + post.folder_relative
+                    base_dir = post.folder_base(lang) + os.sep + os.sep.join(classification)
                     break
             # fallback: first POSTS entry + classification
             if base_dir is None:
