Fix the cache key usage (see #8695).

contao · Apr 20, 2017 · 6289a8c · 6289a8c
1 parent ae7256f
commit 6289a8c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Resources/contao/classes/FrontendTemplate.php b/src/Resources/contao/classes/FrontendTemplate.php
@@ -213,7 +213,7 @@ protected function addToCache()
 			// If the request string is empty, use a special cache tag which considers the page language
 			if (\Environment::get('request') == '' || \Environment::get('request') == 'index.php')
 			{
-				$strCacheKey = \Environment::get('host') . '/empty.' . $objPage->language;
+				$strCacheKey = ($objPage->domain ?: '*') . '/empty.' . $objPage->language;
 			}
 			else
 			{
@@ -250,7 +250,7 @@ protected function addToCache()
 			// Add the cache file header
 			$strHeader = sprintf
 			(
-				"<?php /* %s */ \$expire = %d; \$content = %s; \$type = %s; \$files = %s; \$assets = %s; ?>\n",
+				"<?php\n\n// %s\n\$expire = %d;\n\$content = %s;\n\$type = %s;\n\$files = %s;\n\$assets = %s;\n\n?>\n",
 				$strCacheKey,
 				(int) $intCache,
 				var_export($this->strContentType, true),