From 3dc86f98a3c5920466321e08c77841089179a9f7 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 20 Aug 2013 21:42:06 +0200
Subject: [PATCH] Fixed merge error

---
 code/controllers/ContentController.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/code/controllers/ContentController.php b/code/controllers/ContentController.php
index f45908fa..f2b7a45d 100644
--- a/code/controllers/ContentController.php
+++ b/code/controllers/ContentController.php
@@ -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