mirror of
https://github.com/silverstripe/silverstripe-reports
synced 2024-10-22 11:05:53 +02:00
MINOR: Only clear theme in CMS if we're not redirecting to the login form (better for testing).
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98264 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
06007f4455
commit
5c0df5d691
@ -99,10 +99,6 @@ class LeftAndMain extends Controller {
|
||||
function init() {
|
||||
parent::init();
|
||||
|
||||
// The user's theme shouldn't affect the CMS, if, for example, they have replaced
|
||||
// TableListField.ss or Form.ss.
|
||||
SSViewer::set_theme(null);
|
||||
|
||||
// set language
|
||||
$member = Member::currentUser();
|
||||
if(!empty($member->Locale)) {
|
||||
@ -295,6 +291,10 @@ class LeftAndMain extends Controller {
|
||||
|
||||
$dummy = null;
|
||||
$this->extend('init', $dummy);
|
||||
|
||||
// The user's theme shouldn't affect the CMS, if, for example, they have replaced
|
||||
// TableListField.ss or Form.ss.
|
||||
SSViewer::set_theme(null);
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------------------//
|
||||
|
Loading…
Reference in New Issue
Block a user