From e820c88be06d3af862578028aee1e09ecec061a6 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 16 Oct 2008 11:08:51 +0000
Subject: [PATCH] MINOR Moved Controller::init() to top of file

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64403 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 core/control/Controller.php | 48 ++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/core/control/Controller.php b/core/control/Controller.php
index 5e14791a6..e7f826861 100644
--- a/core/control/Controller.php
+++ b/core/control/Controller.php
@@ -69,6 +69,30 @@ class Controller extends RequestHandlingData {
 		'handleIndex',
 	);
 	
+	/**
+	 * Initialisation function that is run before any action on the controller is called.
+	 * 
+	 * @uses BasicAuth::requireLogin()
+	 */
+	function init() {
+		// Test and development sites should be secured, via basic-auth
+		if(ClassInfo::hasTable("Group") && ClassInfo::hasTable("Member") && Director::isTest() && $this->basicAuthEnabled) {
+			BasicAuth::requireLogin("SilverStripe test website.  Use your  CMS login", "ADMIN");
+		}		
+		
+		//
+		Cookie::set("PastVisitor", true);
+
+		// ClassInfo::hasTable() called to ensure that we're not in a very-first-setup stage
+		if(ClassInfo::hasTable("Group") && ClassInfo::hasTable("Member") && ($member = Member::currentUser())) {
+			Cookie::set("PastMember", true);
+			DB::query("UPDATE Member SET LastVisited = NOW() WHERE ID = $member->ID", null);
+		}
+		
+		// This is used to test that subordinate controllers are actually calling parent::init() - a common bug
+		$this->baseInitCalled = true;
+	}
+	
 	/**
 	 * Handles HTTP requests.
 	 * 
@@ -311,30 +335,6 @@ class Controller extends RequestHandlingData {
 	function disableBasicAuth() {
 		$this->basicAuthEnabled = false;
 	}
-	
-	/**
-	 * Initialisation function that is run before any action on the controller is called.
-	 * 
-	 * @uses BasicAuth::requireLogin()
-	 */
-	function init() {
-		// Test and development sites should be secured, via basic-auth
-		if(ClassInfo::hasTable("Group") && ClassInfo::hasTable("Member") && Director::isTest() && $this->basicAuthEnabled) {
-			BasicAuth::requireLogin("SilverStripe test website.  Use your  CMS login", "ADMIN");
-		}		
-		
-		//
-		Cookie::set("PastVisitor", true);
-
-		// ClassInfo::hasTable() called to ensure that we're not in a very-first-setup stage
-		if(ClassInfo::hasTable("Group") && ClassInfo::hasTable("Member") && ($member = Member::currentUser())) {
-			Cookie::set("PastMember", true);
-			DB::query("UPDATE Member SET LastVisited = NOW() WHERE ID = $member->ID", null);
-		}
-		
-		// This is used to test that subordinate controllers are actually calling parent::init() - a common bug
-		$this->baseInitCalled = true;
-	}
 
 	/**
 	 * Returns the current controller