Merge branch 'master' into es17.01

2017-03-24 18:44:49 +01:00
parent 59a8941635 21e75a6492
commit 5ca9a0cd85
41 changed files with 1182 additions and 505 deletions
--- a/modules/sitemap/cms_sitemap_module.e
+++ b/modules/sitemap/cms_sitemap_module.e
@@ -75,7 +75,7 @@ feature -- Handler
 			d: HTTP_DATE
 		do
 			create {GENERIC_VIEW_CMS_RESPONSE} r.make (req, res, api)
-			create l_cache.make (api.files_location.extended ("modules").extended ("sitemap").extended ("sitemap.xml"))
+			create l_cache.make (api.cache_location.extended (name).extended ("sitemap.xml"))
 			if
 				l_cache.exists and then
 				not l_cache.expired (Void, 24*60*60) -- 1 day