From 06c2bd9b100b8d0ac6aff083578b7a2a12aac8d3 Mon Sep 17 00:00:00 2001
From: Andrew O'Neil <andy@andyofniall.net>
Date: Thu, 25 Oct 2007 02:38:35 +0000
Subject: [PATCH] #1462 - OpenID $currentController problem

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43841 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 core/ViewableData.php                   | 2 +-
 core/control/Director.php               | 2 +-
 security/OpenID/OpenIDAuthenticator.php | 2 +-
 security/Security.php                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/ViewableData.php b/core/ViewableData.php
index 017478221..3cabebae2 100644
--- a/core/ViewableData.php
+++ b/core/ViewableData.php
@@ -756,7 +756,7 @@ class ViewableData extends Object implements Iterator {
 	 * @return Controller
 	 */
 	function CurrentPage() {
-		return Controller::currentController();
+		return Controller::curr();
 	}
 	
 	/**
diff --git a/core/control/Director.php b/core/control/Director.php
index bc12f130b..312df5542 100644
--- a/core/control/Director.php
+++ b/core/control/Director.php
@@ -173,7 +173,7 @@ class Director {
 				return DataObject::get_one("SiteTree", "URLSegment = '$SQL_urlSegment'");
 			}
 		} else {
-			return Controller::currentController();
+			return Controller::curr();
 		}
 	}
 
diff --git a/security/OpenID/OpenIDAuthenticator.php b/security/OpenID/OpenIDAuthenticator.php
index 644664cd8..096c2b8cd 100644
--- a/security/OpenID/OpenIDAuthenticator.php
+++ b/security/OpenID/OpenIDAuthenticator.php
@@ -206,7 +206,7 @@ class OpenIDAuthenticator_Controller extends Controller {
 	 * @param array $requestParams Passed request parameters
 	 */
 	function run($requestParams) {
-		Controller::$currentController = $this;
+		$this->pushCurrent();
 		$this->response = new HTTPResponse();
 
 		parent::init();
diff --git a/security/Security.php b/security/Security.php
index 997fade87..e8e5e2443 100644
--- a/security/Security.php
+++ b/security/Security.php
@@ -428,7 +428,7 @@ class Security extends Controller {
 			}
 		}
 
-		Controller::$currentController = $controller;
+		//Controller::$currentController = $controller;
 		return $customisedController->renderWith('Page');
 	}