Merge branch '5.1' into 5

silverstripe · Feb 3, 2024 · e696e70 · e696e70
2 parents 5c753d5 + 4d96674
commit e696e70
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/tests/php/Forms/ConfirmedPasswordFieldTest.php b/tests/php/Forms/ConfirmedPasswordFieldTest.php
@@ -486,7 +486,9 @@ public function testChildFieldsAreRequired(bool $canBeEmpty, bool $required, boo
         // 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.
         $originalThemes = SSViewer::get_themes();
-        SSViewer::set_themes(LeftAndMain::config()->uninherited('admin_themes'));
+        if (class_exists(LeftAndMain::class)) {
+            SSViewer::set_themes(LeftAndMain::config()->uninherited('admin_themes'));
+        }
         try {
             $form = new Form();
             $field = new ConfirmedPasswordField('Test');