tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

BUGFIX: Make login form work without any theme loaded. 

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98432 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2010-02-08 20:08:26 +00:00
parent 8b1367794e
commit ff666ff25d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
security/Security.php
View File

@ -386,7 +386,7 @@ class Security extends Controller {
Session::clear('Security.Message');
// custom processing
return $customisedController->renderWith(array('Security_login', 'Security', $this->stat('template_main')));
return $customisedController->renderWith(array('Security_login', 'Security', $this->stat('template_main'), 'ContentController'));
}
function basicauthlogin() {
@ -424,7 +424,7 @@ class Security extends Controller {
));
//Controller::$currentController = $controller;
return $customisedController->renderWith(array('Security_lostpassword', 'Security', $this->stat('template_main')));
return $customisedController->renderWith(array('Security_lostpassword', 'Security', $this->stat('template_main'), 'ContentController'));
}
@ -483,7 +483,7 @@ class Security extends Controller {
));
//Controller::$currentController = $controller;
return $customisedController->renderWith(array('Security_passwordsent', 'Security', $this->stat('template_main')));
return $customisedController->renderWith(array('Security_passwordsent', 'Security', $this->stat('template_main'), 'ContentController'));
}
@ -553,7 +553,7 @@ class Security extends Controller {
}
//Controller::$currentController = $controller;
return $customisedController->renderWith(array('Security_changepassword', 'Security', $this->stat('template_main')));
return $customisedController->renderWith(array('Security_changepassword', 'Security', $this->stat('template_main'), 'ContentController'));
}
/**

1
templates/ContentController.ss
View File

@ -8,6 +8,7 @@
<body>
<h1>$Title</h1>
$Content
$Form
<p><i>Generated with the default ContentController.ss template</i></p>
</body>