tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 06:05:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge 96f0a98553c0b1c4a136150cc9b9b9a7179ee433 into bd48b04731f0c83dd9af07d15bc444250d3a12dc

Browse Source
This commit is contained in:
Guy Sartorelli 2024-10-07 22:58:03 +00:00 committed by GitHub
commit 6434166ce4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/Controllers/ContentController.php
View File

@ -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());
}
}

4
code/Model/SiteTree.php
View File

@ -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);

2
tests/php/Controllers/ContentControllerTest.php
View File

@ -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']
);
});
}