mirror of
https://github.com/silverstripe/silverstripe-reports
synced 2024-10-22 11:05:53 +02:00
Merge remote-tracking branch 'origin/3.1.0' into 3.1
This commit is contained in:
commit
f38d46224a
@ -101,6 +101,11 @@ class ContentController extends Controller {
|
|||||||
|
|
||||||
if($this->redirectedTo()) return;
|
if($this->redirectedTo()) return;
|
||||||
|
|
||||||
|
// Check page permissions
|
||||||
|
if($this->dataRecord && $this->URLSegment != 'Security' && !$this->dataRecord->canView()) {
|
||||||
|
return Security::permissionFailure($this);
|
||||||
|
}
|
||||||
|
|
||||||
// Draft/Archive security check - only CMS users should be able to look at stage/archived content
|
// Draft/Archive security check - only CMS users should be able to look at stage/archived content
|
||||||
if(
|
if(
|
||||||
$this->URLSegment != 'Security'
|
$this->URLSegment != 'Security'
|
||||||
@ -128,9 +133,10 @@ class ContentController extends Controller {
|
|||||||
),
|
),
|
||||||
Controller::join_links($this->Link(), "?stage=Live")
|
Controller::join_links($this->Link(), "?stage=Live")
|
||||||
);
|
);
|
||||||
|
|
||||||
|
return Security::permissionFailure($this, $permissionMessage);
|
||||||
}
|
}
|
||||||
|
|
||||||
return Security::permissionFailure($this, $permissionMessage);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Use theme from the site config
|
// Use theme from the site config
|
||||||
|
Loading…
Reference in New Issue
Block a user