From f634ac7e5837791be601db5a75378f47ab9d9c1b Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Wed, 9 Apr 2008 00:35:52 +0000
Subject: [PATCH] Improved behaviour of contentcontrollerInit when extensions
 are applied to subclasses of SiteTree

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@52343 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 core/control/ContentController.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/control/ContentController.php b/core/control/ContentController.php
index 716f9c7c2..83be6c8d2 100644
--- a/core/control/ContentController.php
+++ b/core/control/ContentController.php
@@ -93,7 +93,9 @@ class ContentController extends Controller {
 			return;
 		}
 		
-		singleton('SiteTree')->extend('contentcontrollerInit', $this);
+		$this->dataRecord->extend('contentcontrollerInit', $this);
+		if(Director::redirected_to()) return;
+		
 		Director::set_site_mode('site');
 
 		// Check page permissions