mirror of
https://github.com/silverstripe/silverstripe-cms
synced 2024-10-22 08:05:56 +02:00
Fixed merge error
This commit is contained in:
parent
ba57d42349
commit
3dc86f98a3
@ -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,11 +133,12 @@ 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
|
||||||
if(($config = SiteConfig::current_site_config()) && $config->Theme) {
|
if(($config = SiteConfig::current_site_config()) && $config->Theme) {
|
||||||
Config::inst()->update('SSViewer', 'theme', $config->Theme);
|
Config::inst()->update('SSViewer', 'theme', $config->Theme);
|
||||||
|
Loading…
Reference in New Issue
Block a user