tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

FIX Regression in using template_main to render the Security area

Browse Source 
* Introduced in 0cf477d36
* Should use the "template_main" static to decide which model to use for rendering this page
* Assuming SiteTree means any requirements added in Page and assumed to work everywhere will not
This commit is contained in:
Robbie Averill 2017-01-12 13:11:40 +13:00
parent 2a505b01db
commit a4bc9f49d1
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Security/Security.php
View File

@ -514,15 +514,17 @@ class Security extends Controller implements TemplateGlobalProvider
return $this; return $this;
} }
// Use sitetree pages to render the security page // Use the default setting for which Page to use to render the security page
$tmpPage = new SiteTree(); $pageClass = (string) $this->stat('template_main');
$tmpPage = new $pageClass;
$tmpPage->Title = $title; $tmpPage->Title = $title;
/** @skipUpgrade */ /** @skipUpgrade */
$tmpPage->URLSegment = 'Security'; $tmpPage->URLSegment = 'Security';
// Disable ID-based caching of the log-in page by making it a random number // Disable ID-based caching of the log-in page by making it a random number
$tmpPage->ID = -1 * rand(1, 10000000); $tmpPage->ID = -1 * rand(1, 10000000);
$controller = ContentController::create($tmpPage); $controllerClass = $tmpPage->getControllerName();
$controller = $controllerClass::create($tmpPage);
$controller->setDataModel($this->model); $controller->setDataModel($this->model);
$controller->doInit(); $controller->doInit();
return $controller; return $controller;