From c4a72efd527f0ea88f388a26011772588bade8e9 Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Mon, 18 Oct 2010 22:53:03 +0000 Subject: [PATCH] BUGFIX: Added condition to avoid error creating "PastMember" cookie on dev/build (ticket #5780) Thanks simon_w (from r108397) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112724 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/control/Controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/control/Controller.php b/core/control/Controller.php index 65691bb60..dd77c2079 100755 --- a/core/control/Controller.php +++ b/core/control/Controller.php @@ -81,7 +81,7 @@ class Controller extends RequestHandler { if(Session::get('loggedInAs') && Security::database_is_ready()) { $member = Member::currentUser(); if($member) { - Cookie::set("PastMember", true, 90, null, null, false, true); + if(!headers_sent()) Cookie::set("PastMember", true, 90, null, null, false, true); DB::query("UPDATE \"Member\" SET \"LastVisited\" = " . DB::getConn()->now() . " WHERE \"ID\" = $member->ID", null); } }