MINOR merged from trunk

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66944 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2008-11-28 05:30:31 +00:00 committed by Sam Minnee
parent 3673a604c6
commit 3d5600c597
2 changed files with 4 additions and 5 deletions

View File

@ -53,8 +53,7 @@ class HTTPResponse extends Object {
303, 303,
304, 304,
305, 305,
307, 307
403
); );
protected $statusCode = 200; protected $statusCode = 200;
@ -174,7 +173,7 @@ class HTTPResponse extends Object {
if(Director::is_ajax()) { if(Director::is_ajax()) {
Requirements::include_in_response($this); Requirements::include_in_response($this);
} }
if(in_array($this->statusCode, self::$redirect_codes) && headers_sent($file, $line)) { if(in_array($this->statusCode, self::$redirect_codes) && headers_sent($file, $line)) {
$url = $this->headers['Location']; $url = $this->headers['Location'];
echo echo

View File

@ -200,8 +200,8 @@ class Security extends Controller {
// TODO AccessLogEntry needs an extension to handle permission denied errors // TODO AccessLogEntry needs an extension to handle permission denied errors
// Audit logging hook // Audit logging hook
if($controller) $controller->extend('permissionDenied', $member); if($controller) $controller->extend('permissionDenied', $member);
Director::redirect("Security/login", 403); Director::redirect("Security/login");
} }
return; return;
} }