Merge branch '4.8' into 4

This commit is contained in:
Steve Boyd 2021-07-07 14:01:30 +12:00
commit 12c11e5308

View File

@ -1703,7 +1703,10 @@ class SiteTreeTest extends SapphireTest
$cache = $method->invokeArgs($provider, []); $cache = $method->invokeArgs($provider, []);
$method = $reflector->getMethod('deriveCacheKey'); $method = $reflector->getMethod('deriveCacheKey');
$method->setAccessible(true); $method->setAccessible(true);
$key = $method->invokeArgs($provider, [$url]); $class = 'leftAlone ss-htmleditorfield-file embed';
$width = '480';
$height = '270';
$key = $method->invokeArgs($provider, [$url, $class, $width, $height]);
// Set cache (VersionedCacheAdapter) on both DRAFT and LIVE // Set cache (VersionedCacheAdapter) on both DRAFT and LIVE
foreach ([Versioned::DRAFT, Versioned::LIVE] as $stage) { foreach ([Versioned::DRAFT, Versioned::LIVE] as $stage) {