tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9434 from mattclegg/bugfix--silverstripe-admin--requirements

Browse Source 
[BUGFIX] silverstripe/admin is not required to be installed
This commit is contained in:
Robbie Averill 2020-03-16 09:48:39 -07:00 committed by GitHub
commit b6512edec8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Security/CMSSecurity.php
View File

@ -39,10 +39,12 @@ class CMSSecurity extends Security
// Assign default cms theme and replace user-specified themes // Assign default cms theme and replace user-specified themes
SSViewer::set_themes(LeftAndMain::config()->uninherited('admin_themes')); SSViewer::set_themes(LeftAndMain::config()->uninherited('admin_themes'));
if (ModuleLoader::getModule('silverstripe/admin')) {
// Core styles / vendor scripts // Core styles / vendor scripts
Requirements::javascript('silverstripe/admin: client/dist/js/vendor.js'); Requirements::javascript('silverstripe/admin: client/dist/js/vendor.js');
Requirements::css('silverstripe/admin: client/dist/styles/bundle.css'); Requirements::css('silverstripe/admin: client/dist/styles/bundle.css');
} }
}
public function login($request = null, $service = Authenticator::CMS_LOGIN) public function login($request = null, $service = Authenticator::CMS_LOGIN)
{ {