tonyair
/
silverstripe-reports
mirror of https://github.com/silverstripe/silverstripe-reports
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed merge error

This commit is contained in:
Ingo Schommer 2013-08-20 21:42:06 +02:00
parent ba57d42349
commit 3dc86f98a3
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
code/controllers/ContentController.php
View File

@ -101,6 +101,11 @@ class ContentController extends Controller {
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
if(
$this->URLSegment != 'Security'
@ -128,9 +133,10 @@ class ContentController extends Controller {
),
Controller::join_links($this->Link(), "?stage=Live")
);
return Security::permissionFailure($this, $permissionMessage);
}
return Security::permissionFailure($this, $permissionMessage);
}
// Use theme from the site config