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

Merge pull request #863 from tractorcow/3.0-security-DI-fixes

Browse Source 
BUG: Fixed use of DI in the Security controller
This commit is contained in:
Sean Harvey 2012-10-10 18:04:43 -07:00
commit fe65da7250
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
security/Security.php
View File

@ -341,7 +341,7 @@ class Security extends Controller {
// 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 = new Page_Controller($tmpPage); $controller = Page_Controller::create($tmpPage);
$controller->setDataModel($this->model); $controller->setDataModel($this->model);
$controller->init(); $controller->init();
//Controller::$currentController = $controller; //Controller::$currentController = $controller;
@ -436,7 +436,7 @@ class Security extends Controller {
$tmpPage->Title = _t('Security.LOSTPASSWORDHEADER', 'Lost Password'); $tmpPage->Title = _t('Security.LOSTPASSWORDHEADER', 'Lost Password');
$tmpPage->URLSegment = 'Security'; $tmpPage->URLSegment = 'Security';
$tmpPage->ID = -1; // Set the page ID to -1 so we dont get the top level pages as its children $tmpPage->ID = -1; // Set the page ID to -1 so we dont get the top level pages as its children
$controller = new Page_Controller($tmpPage); $controller = Page_Controller::create($tmpPage);
$controller->init(); $controller->init();
} else { } else {
$controller = $this; $controller = $this;
@ -495,7 +495,7 @@ class Security extends Controller {
$tmpPage->Title = _t('Security.LOSTPASSWORDHEADER'); $tmpPage->Title = _t('Security.LOSTPASSWORDHEADER');
$tmpPage->URLSegment = 'Security'; $tmpPage->URLSegment = 'Security';
$tmpPage->ID = -1; // Set the page ID to -1 so we dont get the top level pages as its children $tmpPage->ID = -1; // Set the page ID to -1 so we dont get the top level pages as its children
$controller = new Page_Controller($tmpPage); $controller = Page_Controller::create($tmpPage);
$controller->init(); $controller->init();
} else { } else {
$controller = $this; $controller = $this;
@ -553,7 +553,7 @@ class Security extends Controller {
$tmpPage->Title = _t('Security.CHANGEPASSWORDHEADER', 'Change your password'); $tmpPage->Title = _t('Security.CHANGEPASSWORDHEADER', 'Change your password');
$tmpPage->URLSegment = 'Security'; $tmpPage->URLSegment = 'Security';
$tmpPage->ID = -1; // Set the page ID to -1 so we dont get the top level pages as its children $tmpPage->ID = -1; // Set the page ID to -1 so we dont get the top level pages as its children
$controller = new Page_Controller($tmpPage); $controller = Page_Controller::create($tmpPage);
$controller->init(); $controller->init();
} else { } else {
$controller = $this; $controller = $this;