MINOR: Only clear theme in CMS if we're not redirecting to the login form (better for testing). (from r98264)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@105859 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2010-05-28 02:37:30 +00:00
parent 77e3067eb9
commit 12e7d39f27

View File

@ -106,10 +106,6 @@ class LeftAndMain extends Controller {
SSViewer::setOption('rewriteHashlinks', false); SSViewer::setOption('rewriteHashlinks', false);
// 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 // set language
$member = Member::currentUser(); $member = Member::currentUser();
if(!empty($member->Locale)) { if(!empty($member->Locale)) {
@ -307,6 +303,10 @@ class LeftAndMain extends Controller {
$dummy = null; $dummy = null;
$this->extend('init', $dummy); $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);
} }
//------------------------------------------------------------------------------------------// //------------------------------------------------------------------------------------------//