tonyair/silverstripe-subsites
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-subsites synced 2024-10-22 11:05:55 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #536 from creative-commoners/pulls/3/cmsprofilecontroller

Browse Source 
FIX Set extraCodes to false for CMSProfileController
This commit is contained in:
Guy Sartorelli 2023-08-28 12:36:15 +12:00 committed by GitHub
commit 649ae279f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Extensions/LeftAndMainSubsites.php
View File

@ -4,6 +4,7 @@ namespace SilverStripe\Subsites\Extensions;
use SilverStripe\Admin\AdminRootController; use SilverStripe\Admin\AdminRootController;
use SilverStripe\Admin\CMSMenu; use SilverStripe\Admin\CMSMenu;
use SilverStripe\Admin\CMSProfileController;
use SilverStripe\Admin\LeftAndMainExtension; use SilverStripe\Admin\LeftAndMainExtension;
use SilverStripe\CMS\Controllers\CMSPagesController; use SilverStripe\CMS\Controllers\CMSPagesController;
use SilverStripe\CMS\Model\SiteTree; use SilverStripe\CMS\Model\SiteTree;
@ -88,12 +89,18 @@ class LeftAndMainSubsites extends LeftAndMainExtension
// Collect permissions - honour the LeftAndMain::required_permission_codes, current model requires // Collect permissions - honour the LeftAndMain::required_permission_codes, current model requires
// us to check if the user satisfies ALL permissions. Code partly copied from LeftAndMain::canView. // us to check if the user satisfies ALL permissions. Code partly copied from LeftAndMain::canView.
$codes = []; $codes = [];
$extraCodes = Config::inst()->get(get_class($this->owner), 'required_permission_codes'); $ownerClass = get_class($this->owner);
$extraCodes = Config::inst()->get($ownerClass, 'required_permission_codes');
if ($ownerClass === CMSProfileController::class) {
// This matches the behaviour before merging
// https://github.com/silverstripe/silverstripe-admin/pull/1027
$extraCodes = false;
}
if ($extraCodes !== false) { if ($extraCodes !== false) {
if ($extraCodes) { if ($extraCodes) {
$codes = array_merge($codes, (array)$extraCodes); $codes = array_merge($codes, (array)$extraCodes);
} else { } else {
$codes[] = sprintf('CMS_ACCESS_%s', get_class($this->owner)); $codes[] = sprintf('CMS_ACCESS_%s', $ownerClass);
} }
} else { } else {
// Check overriden - all subsites accessible. // Check overriden - all subsites accessible.