Merge pull request #98 from shadlaws/fix_1954

#1954 - Skip buffer calls for unit tests of file_proxy and data_rest.

1 files changed, 6 insertions, 5 deletions

diff --git a/modules/gallery/helpers/data_rest.php b/modules/gallery/helpers/data_rest.php
index 8a3a159d..dc213510 100644
--- a/modules/gallery/helpers/data_rest.php
+++ b/modules/gallery/helpers/data_rest.php
@@ -57,13 +57,14 @@ class data_rest_Core {
     } else {
       header("Content-Type: $item->mime_type");
     }
-    Kohana::close_buffers(false);
 
-    if (isset($p->encoding) && $p->encoding == "base64") {
-      print base64_encode(file_get_contents($file));
+    if (TEST_MODE) {
+      return $file;
     } else {
-      if (TEST_MODE) {
-        return $file;
+      Kohana::close_buffers(false);
+
+      if (isset($p->encoding) && $p->encoding == "base64") {
+        print base64_encode(file_get_contents($file));
       } else {
         readfile($file);
       }