From 126d6ebbf42b3cf23fc12d71a4736e1c9619f76d Mon Sep 17 00:00:00 2001 From: Andrew O'Neil Date: Wed, 17 Oct 2007 22:18:34 +0000 Subject: [PATCH] #1488 - Access to 'logged in' users for home page fails (attempts to redirect to Security/login forever) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.1.1@43530 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/control/ContentController.php | 2 +- core/model/SiteTree.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/control/ContentController.php b/core/control/ContentController.php index d4551393a..89fc304ab 100644 --- a/core/control/ContentController.php +++ b/core/control/ContentController.php @@ -86,7 +86,7 @@ class ContentController extends Controller { Director::set_site_mode('site'); // Check permissions - if($this->dataRecord && !$this->dataRecord->can('View')) { + if($this->dataRecord && $this->URLSegment != 'Security' && !$this->dataRecord->can('View')) { Security::permissionFailure($this); } } diff --git a/core/model/SiteTree.php b/core/model/SiteTree.php index bd4f95849..39885b2da 100644 --- a/core/model/SiteTree.php +++ b/core/model/SiteTree.php @@ -291,6 +291,7 @@ class SiteTree extends DataObject { break; case 'view': case 'view_page': + if(!$this->Viewers) return true; // If Viewers isn't set, then assume it is Anyone if($this->Viewers == 'Anyone') return true; if($member && $this->Viewers == 'LoggedInUsers') return true; if($member && $this->Viewers == 'OnlyTheseUsers' && $member->isInGroup($this->ViewersGroup)) return true;