Add a .desktop suffix to the cache file of a page with a mobile layou…

…t (see #7826).
contao · Jun 3, 2015 · 570d80e · 570d80e
1 parent 74515f1
commit 570d80e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/src/Resources/contao/classes/FrontendTemplate.php b/src/Resources/contao/classes/FrontendTemplate.php
@@ -230,10 +230,17 @@ protected function addToCache()
 				}
 			}
 
-			// Store mobile pages separately
-			if (\Input::cookie('TL_VIEW') == 'mobile' || (\Environment::get('agent')->mobile && \Input::cookie('TL_VIEW') != 'desktop'))
+			// Add a suffix if there is a mobile layout (see #7826)
+			if ($objPage->mobileLayout > 0)
 			{
-				$strCacheKey .= '.mobile';
+				if (\Input::cookie('TL_VIEW') == 'mobile' || (\Environment::get('agent')->mobile && \Input::cookie('TL_VIEW') != 'desktop'))
+				{
+					$strCacheKey .= '.mobile';
+				}
+				else
+				{
+					$strCacheKey .= '.desktop';
+				}
 			}
 
 			// Replace insert tags for caching

diff --git a/src/Resources/contao/controllers/FrontendIndex.php b/src/Resources/contao/controllers/FrontendIndex.php
@@ -382,6 +382,18 @@ protected function outputFromCache()
 			}
 		}
 
+		// Check for a desktop layout (see #7826)
+		if (!$blnFound)
+		{
+			$strMd5CacheKey = md5($strCacheKey . '.desktop');
+			$strCacheFile = TL_ROOT . '/system/cache/html/' . substr($strMd5CacheKey, 0, 1) . '/' . $strMd5CacheKey . '.html';
+
+			if (file_exists($strCacheFile))
+			{
+				$blnFound = true;
+			}
+		}
+
 		// Check for a regular layout
 		if (!$blnFound)
 		{