From 14073dc742954fa44b599df285ca5e106c671cf0 Mon Sep 17 00:00:00 2001 From: euromark Date: Mon, 22 Dec 2014 21:02:52 +0100 Subject: [PATCH 1/2] Don't send response from view. --- lib/Cake/View/MediaView.php | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/Cake/View/MediaView.php b/lib/Cake/View/MediaView.php index 00b5e5ec6..a03888a39 100644 --- a/lib/Cake/View/MediaView.php +++ b/lib/Cake/View/MediaView.php @@ -93,7 +93,6 @@ class MediaView extends View { if ($compress) { $this->response->compress(); } - $this->response->send(); } } From 0a974dd59f231705fab8c714b7de8010997c465a Mon Sep 17 00:00:00 2001 From: euromark Date: Mon, 22 Dec 2014 22:07:51 +0100 Subject: [PATCH 2/2] Adjust tests --- lib/Cake/Test/Case/View/MediaViewTest.php | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/lib/Cake/Test/Case/View/MediaViewTest.php b/lib/Cake/Test/Case/View/MediaViewTest.php index d3b8dc70d..4fc0a7242 100644 --- a/lib/Cake/Test/Case/View/MediaViewTest.php +++ b/lib/Cake/Test/Case/View/MediaViewTest.php @@ -77,9 +77,6 @@ class MediaViewTest extends CakeTestCase { array('name' => null, 'download' => null) ); - $this->MediaView->response->expects($this->once()) - ->method('send'); - $this->MediaView->render(); } @@ -115,9 +112,6 @@ class MediaViewTest extends CakeTestCase { ) ); - $this->MediaView->response->expects($this->once()) - ->method('send'); - $this->MediaView->render(); } @@ -137,10 +131,6 @@ class MediaViewTest extends CakeTestCase { ->with('jpg') ->will($this->returnArgument(0)); - $this->MediaView->response->expects($this->at(0)) - ->method('send') - ->will($this->returnValue(true)); - $this->MediaView->render(); }