From a2026add041db389013d50f408c1bf6a0e0e1aa4 Mon Sep 17 00:00:00 2001
From: Hamish Friedlander <hamish@silverstripe.com>
Date: Wed, 21 Aug 2013 09:50:07 +1200
Subject: [PATCH] FIX flushing on non-dev when Session::cookie_secure is true

---
 main.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.php b/main.php
index b7f2a9ca5..f60b5d9c9 100644
--- a/main.php
+++ b/main.php
@@ -138,7 +138,7 @@ $chain
 
 			// Otherwise, we start up the session if needed, then check for admin
 			if (!$canFlush) {
-				if(!isset($_SESSION) && (isset($_COOKIE[session_name()]) || isset($_REQUEST[session_name()]))) {
+				if(!isset($_SESSION) && Session::request_contains_session_id()) {
 					Session::start();
 				}