Skip to content

Commit

Permalink
MINOR: Only clear theme in CMS if we're not redirecting to the login …
Browse files Browse the repository at this point in the history
…form (better for testing).

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98264 467b73ca-7a2a-4603-9d3b-597d59a354a9
  • Loading branch information
Sam Minnee committed Feb 2, 2011
1 parent 06007f4 commit 5c0df5d
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions code/LeftAndMain.php
Expand Up @@ -99,10 +99,6 @@ function canView($member = null) {
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)) {
Expand Down Expand Up @@ -295,6 +291,10 @@ function init() {

$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);
}

//------------------------------------------------------------------------------------------//
Expand Down

0 comments on commit 5c0df5d

Please sign in to comment.