From 60ca784aaef1ee6386ca8b4c29dc03b27ddd7254 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Sat, 12 Feb 2011 16:39:35 +1300 Subject: [PATCH] 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) --- core/control/Director.php | 15 --------------- security/Security.php | 3 --- 2 files changed, 18 deletions(-) diff --git a/core/control/Director.php b/core/control/Director.php index 1b7a645b6..44a8b0134 100755 --- a/core/control/Director.php +++ b/core/control/Director.php @@ -42,21 +42,6 @@ class Director { */ 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. diff --git a/security/Security.php b/security/Security.php index 395912a33..6cfd0df63 100644 --- a/security/Security.php +++ b/security/Security.php @@ -211,9 +211,6 @@ class Security extends Controller { $response->setBody($formText); return $response; - - } else if(substr(Director::history(),0,15) == 'Security/logout') { - $message = $messageSet['logInAgain'] ? $messageSet['logInAgain'] : $messageSet['default']; } else { $message = $messageSet['default']; }