Merge branch 'master' of git@github.com:talmdal/gallery3 into talmdal_branch

1 files changed, 5 insertions, 4 deletions

diff --git a/modules/gallery/controllers/combined.php b/modules/gallery/controllers/combined.php
index 9a790fdf..c1f42bfe 100644
--- a/modules/gallery/controllers/combined.php
+++ b/modules/gallery/controllers/combined.php
@@ -42,22 +42,23 @@ class Combined_Controller extends Controller {
   private function _emit($type, $key) {
     $input = Input::instance();
 
+    // We don't need to save the session for this request
+    Session::abort_save();
+
     // Our data is immutable, so if they already have a copy then it needs no updating.
     if ($input->server("HTTP_IF_MODIFIED_SINCE")) {
       header('HTTP/1.0 304 Not Modified');
       header("Expires: Tue, 19 Jan 2038 00:00:00 GMT");
       header("Cache-Control: max-age=2678400");
       header('Pragma: public');
-      return;
+      Kohana::close_buffers(false);
+      return "";
     }
 
     if (empty($key)) {
       Kohana::show_404();
     }
 
-    // We don't need to save the session for this request
-    Session::abort_save();
-
     $cache = Cache::instance();
     $use_gzip = function_exists("gzencode") &&
       stripos($input->server("HTTP_ACCEPT_ENCODING"), "gzip") !== false &&