tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

#1462 - OpenID $currentController problem

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43841 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Andrew O'Neil 2007-10-25 02:38:35 +00:00
parent a68a8e5c39
commit 06c2bd9b10
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/ViewableData.php
View File

@ -756,7 +756,7 @@ class ViewableData extends Object implements Iterator {
* @return Controller * @return Controller
*/ */
function CurrentPage() { function CurrentPage() {
return Controller::currentController(); return Controller::curr();
} }
/** /**

2
core/control/Director.php
View File

@ -173,7 +173,7 @@ class Director {
return DataObject::get_one("SiteTree", "URLSegment = '$SQL_urlSegment'"); return DataObject::get_one("SiteTree", "URLSegment = '$SQL_urlSegment'");
} }
} else { } else {
return Controller::currentController(); return Controller::curr();
} }
} }

2
security/OpenID/OpenIDAuthenticator.php
View File

@ -206,7 +206,7 @@ class OpenIDAuthenticator_Controller extends Controller {
* @param array $requestParams Passed request parameters * @param array $requestParams Passed request parameters
*/ */
function run($requestParams) { function run($requestParams) {
Controller::$currentController = $this; $this->pushCurrent();
$this->response = new HTTPResponse(); $this->response = new HTTPResponse();
parent::init(); parent::init();

2
security/Security.php
View File

@ -428,7 +428,7 @@ class Security extends Controller {
} }
} }
Controller::$currentController = $controller; //Controller::$currentController = $controller;
return $customisedController->renderWith('Page'); return $customisedController->renderWith('Page');
} }