tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-30 05:09:06 +02:00
Code Issues Projects Releases Wiki Activity

API CHANGE Removed Director::history(), history was no longer recorded. Removed Director::__construct(), as Director is a static utility class without instance state (fixes #6385)

Browse Source
This commit is contained in:
Ingo Schommer 2011-02-12 16:39:35 +13:00
parent a63215c6a5
commit 60ca784aae
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/control/Director.php
View File

@ -42,21 +42,6 @@ class Director {
*/ */
static protected $callbacks; static protected $callbacks;
function __construct() {
if(isset($_GET['debug_profile'])) Profiler::mark("Director", "construct");
Session::addToArray('history', substr($_SERVER['REQUEST_URI'], strlen(Director::baseURL())));
if(isset($_GET['debug_profile'])) Profiler::unmark("Director", "construct");
}
/**
* Return a URL from this user's navigation history.
* @param pagesBack The number of pages back to go. The default, 1, returns the previous
* page.
*/
static function history($pagesBack = 1) {
return Session::get('history.' . intval(sizeof(Session::get('history')) - $pagesBack - 1));
}
/** /**
* Add URL matching rules to the Director. * Add URL matching rules to the Director.

3
security/Security.php
View File

@ -211,9 +211,6 @@ class Security extends Controller {
$response->setBody($formText); $response->setBody($formText);
return $response; return $response;
} else if(substr(Director::history(),0,15) == 'Security/logout') {
$message = $messageSet['logInAgain'] ? $messageSet['logInAgain'] : $messageSet['default'];
} else { } else {
$message = $messageSet['default']; $message = $messageSet['default'];
} }