Merge pull request #110 from plone/master_fix_issue_91

Fix sitemap.xml.gz for plone.app.multilingual (>= 2.x)
plone · Dec 30, 2016 · b219090 · b219090
2 parents 42187ca + dc5bf98
commit b219090
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -6,7 +6,11 @@ Changelog
 
 Breaking changes:
 
-- *add item here*
+- Fix sitemap.xml.gz for plone.app.multilingual (>= 2.x) but breaks it for 
+  LinguaPlone and plone.app.multilingual 1.x
+  If this is a problem then please see bedbfeb67 on 2.5.x branch for how to 
+  maintain compatibility with these products.
+  [djowett]
 
 New features:
 

diff --git a/plone/app/layout/sitemap/sitemap.py b/plone/app/layout/sitemap/sitemap.py
@@ -54,7 +54,7 @@ def objects(self):
 
         query['is_default_page'] = True
         default_page_modified = OOBTree()
-        for item in catalog.searchResults(query, Language='all'):
+        for item in catalog.searchResults(query):
             key = item.getURL().rsplit('/', 1)[0]
             value = (item.modified.micros(), item.modified.ISO8601())
             default_page_modified[key] = value
@@ -78,7 +78,7 @@ def objects(self):
             }
 
         query['is_default_page'] = False
-        for item in catalog.searchResults(query, Language='all'):
+        for item in catalog.searchResults(query):
             loc = item.getURL()
             date = item.modified
             # Comparison must be on GMT value