Merge branch '4.13' into 4

This commit is contained in:
github-actions 2024-02-03 14:23:58 +00:00
commit 02dc9ec7a3

View File

@ -442,7 +442,9 @@ class ConfirmedPasswordFieldTest extends SapphireTest
// CWP front-end templates break this logic - but there's no easy fix for that. // CWP front-end templates break this logic - but there's no easy fix for that.
// For the most part we are interested in ensuring this works in the CMS with default templates. // For the most part we are interested in ensuring this works in the CMS with default templates.
$originalThemes = SSViewer::get_themes(); $originalThemes = SSViewer::get_themes();
if (class_exists(LeftAndMain::class)) {
SSViewer::set_themes(LeftAndMain::config()->uninherited('admin_themes')); SSViewer::set_themes(LeftAndMain::config()->uninherited('admin_themes'));
}
try { try {
$form = new Form(); $form = new Form();
$field = new ConfirmedPasswordField('Test'); $field = new ConfirmedPasswordField('Test');