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

Merged revisions 49507 via svnmerge from

Browse Source 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r49507 | ischommer | 2008-02-13 15:41:11 +1300 (Wed, 13 Feb 2008) | 1 line
  
  using stat() to get template (works with subclasses)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52410 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2008-04-09 11:26:31 +00:00
parent 067d2a5804
commit ca199a64e4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
security/Security.php
View File

@ -314,9 +314,9 @@ class Security extends Controller {
// custom processing // custom processing
if(SSViewer::hasTemplate("Security_login")) { if(SSViewer::hasTemplate("Security_login")) {
return $customisedController->renderWith(array("Security_login", self::$template_main)); return $customisedController->renderWith(array("Security_login", $this->stat('template_main')));
} else { } else {
return $customisedController->renderWith(self::$template_main); return $customisedController->renderWith($this->stat('template_main'));
} }
} }
@ -356,7 +356,7 @@ class Security extends Controller {
)); ));
//Controller::$currentController = $controller; //Controller::$currentController = $controller;
return $customisedController->renderWith(self::$template_main); return $customisedController->renderWith($this->stat('template_main'));
} }
@ -404,7 +404,7 @@ class Security extends Controller {
)); ));
//Controller::$currentController = $controller; //Controller::$currentController = $controller;
return $customisedController->renderWith(self::$template_main); return $customisedController->renderWith($this->stat('template_main'));
} }
@ -474,7 +474,7 @@ class Security extends Controller {
} }
//Controller::$currentController = $controller; //Controller::$currentController = $controller;
return $customisedController->renderWith(self::$template_main); return $customisedController->renderWith($this->stat('template_main'));
} }