Merge 96f0a98553 into bd48b04731

code/Controllers/ContentController.php

@@ -430,6 +430,6 @@ HTML;
         $templatesFound[] = SSViewer::get_templates_by_class(static::class, "", Controller::class);
 
         $templates = array_merge(...$templatesFound);
-        return SSViewer::create($templates);
+        return SSViewer::create($templates, $this->getTemplateEngine());
     }
 }

code/Model/SiteTree.php

@@ -1454,7 +1454,7 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
 
         $tags['title'] = [
             'tag' => 'title',
-            'content' => $this->obj('Title')->forTemplate()
+            'content' => $this->obj('Title')?->forTemplate()
         ];
 
         $generator = $this->getGenerator();
@@ -1601,7 +1601,7 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
 
         $tagString = implode("\n", $tags);
         if ($this->ExtraMeta) {
-            $tagString .= $this->obj('ExtraMeta')->forTemplate();
+            $tagString .= $this->obj('ExtraMeta')?->forTemplate();
         }
 
         $this->extend('updateMetaTags', $tagString);

tests/php/Controllers/ContentControllerTest.php

@@ -203,7 +203,7 @@ class ContentControllerTest extends FunctionalTest
                 __DIR__
                 . '/themes/controllertest/templates/SilverStripe/CMS/Tests/Controllers/'
                 . 'ContentControllerTestPage_test.ss',
-                $viewer->templates()['main']
+                $viewer->getTemplateEngine()->templates()['main']
             );
         });
     }