From 392543bde3972f7738fb89d32c34eb48d4ec6e20 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Fri, 4 May 2012 11:30:45 +0200 Subject: [PATCH] BUGFIX Don't' set 'Referer' header in FunctionalTest->get()/post() if its explicitly passed to the method --- dev/TestSession.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev/TestSession.php b/dev/TestSession.php index 81c920f88..943baf352 100644 --- a/dev/TestSession.php +++ b/dev/TestSession.php @@ -43,7 +43,7 @@ class TestSession { */ function get($url, $session = null, $headers = null, $cookies = null) { $headers = (array) $headers; - if($this->lastUrl) $headers['Referer'] = $this->lastUrl; + if($this->lastUrl && !isset($headers['Referer'])) $headers['Referer'] = $this->lastUrl; $this->lastResponse = Director::test($url, null, $session ? $session : $this->session, null, null, $headers, $cookies); $this->lastUrl = $url; if(!$this->lastResponse) user_error("Director::test($url) returned null", E_USER_WARNING); @@ -56,7 +56,7 @@ class TestSession { */ function post($url, $data, $headers = null, $session = null, $body = null, $cookies = null) { $headers = (array) $headers; - if($this->lastUrl) $headers['Referer'] = $this->lastUrl; + if($this->lastUrl && !isset($headers['Referer'])) $headers['Referer'] = $this->lastUrl; $this->lastResponse = Director::test($url, $data, $session ? $session : $this->session, null, $body, $headers, $cookies); $this->lastUrl = $url; if(!$this->lastResponse) user_error("Director::test($url) returned null", E_USER_WARNING); @@ -198,4 +198,4 @@ class TestSession_STResponseWrapper { function getRequestData() { return null; } -} \ No newline at end of file +}